Move event-function from util to node.

Author: L3MON4D3

lua/luasnip/nodes/choiceNode.lua

@@ -112,11 +112,11 @@ function ChoiceNode:input_enter()
 	Luasnip_active_choice_node = self
 	self.active = true
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 function ChoiceNode:input_leave()
-	util.node_event(self, events.leave)
+	self:event(events.leave)
 
 	self.mark:update_opts(self.parent.ext_opts[self.type].passive)
 	self:update_dependents()
@@ -180,7 +180,7 @@ function ChoiceNode:change_choice(dir)
 
 	-- Another node may have been entered in update_dependents.
 	self.parent:enter_node(self.indx)
-	util.node_event(self, events.change_choice)
+	self:event(events.change_choice)
 	return self.active_choice:jump_into(1)
 end
 

lua/luasnip/nodes/dynamicNode.lua

@@ -39,11 +39,11 @@ function DynamicNode:input_enter()
 	self.active = true
 	self.mark:update_opts(self.parent.ext_opts[self.type].active)
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 function DynamicNode:input_leave()
-	util.node_event(self, events.leave)
+	self:event(events.leave)
 
 	self:update_dependents()
 	self.active = false

lua/luasnip/nodes/functionNode.lua

@@ -39,7 +39,7 @@ function FunctionNode:input_enter()
 	)
 	util.normal_move_on_insert(self.mark:pos_begin())
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 local errorstring = [[

lua/luasnip/nodes/insertNode.lua

@@ -47,15 +47,15 @@ function ExitNode:input_enter(no_move)
 			)
 		end
 
-		util.node_event(self, events.enter)
+		self:event(events.enter)
 	end
 end
 
 function ExitNode:input_leave()
 	if self.pos == 0 then
 		InsertNode.input_leave(self)
 	else
-		util.node_event(self, events.leave)
+		self:event(events.leave)
 	end
 end
 
@@ -111,7 +111,7 @@ function InsertNode:input_enter(no_move)
 		self.parent:enter_node(self.indx)
 	end
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 function InsertNode:jump_into(dir, no_move)
@@ -178,7 +178,7 @@ function InsertNode:jump_from(dir, no_move)
 end
 
 function InsertNode:input_leave()
-	util.node_event(self, events.leave)
+	self:event(events.leave)
 
 	self:update_dependents()
 	self.mark:update_opts(self.parent.ext_opts[self.type].passive)

lua/luasnip/nodes/node.lua

@@ -1,3 +1,4 @@
+local session = require("luasnip.session")
 local util = require("luasnip.util.util")
 local events = require("luasnip.util.events")
 
@@ -25,7 +26,7 @@ end
 function Node:input_enter(_)
 	self.mark:update_opts(self.parent.ext_opts[self.type].active)
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 function Node:jump_into(_, no_move)
@@ -93,7 +94,7 @@ function Node:exit()
 end
 
 function Node:input_leave()
-	util.node_event(self, events.leave)
+	self:event(events.leave)
 
 	self.mark:update_opts(self.parent.ext_opts[self.type].passive)
 end
@@ -121,6 +122,11 @@ function Node:populate_argnodes() end
 
 function Node:subsnip_init() end
 
+function Node:event(event)
+	session.event_node = self
+	vim.cmd("doautocmd User Luasnip" .. events.to_string(self.type, event))
+end
+
 Node.ext_gravities_active = { false, true }
 
 return {

lua/luasnip/nodes/snippet.lua

@@ -667,11 +667,11 @@ function Snippet:input_enter()
 	self.active = true
 	self.mark:update_opts(self.ext_opts[self.type].active)
 
-	util.node_event(self, events.enter)
+	self:event(events.enter)
 end
 
 function Snippet:input_leave()
-	util.node_event(self, events.leave)
+	self:event(events.leave)
 
 	self:update_dependents()
 	self.active = false

lua/luasnip/nodes/textNode.lua

@@ -23,7 +23,7 @@ function TextNode:input_enter(no_move)
 		util.normal_move_on_insert(util.get_ext_position_begin(self.mark.id))
 	end
 
-	util.node_event(self, events.enter, no_move)
+	self:event(events.enter, no_move)
 end
 
 function TextNode:put_initial(pos)

lua/luasnip/util/util.lua

@@ -1,5 +1,4 @@
 local events = require("luasnip.util.events")
-local session = require("luasnip.session")
 
 local function get_cursor_0ind()
 	local c = vim.api.nvim_win_get_cursor(0)
@@ -441,11 +440,6 @@ local function find_outer_snippet(node)
 	return node
 end
 
-local function node_event(node, event)
-	session.event_node = node
-	vim.cmd("doautocmd User Luasnip" .. events.to_string(node.type, event))
-end
-
 return {
 	get_cursor_0ind = get_cursor_0ind,
 	set_cursor_0ind = set_cursor_0ind,
@@ -477,5 +471,4 @@ return {
 	string_wrap = string_wrap,
 	to_line_table = to_line_table,
 	find_outer_snippet = find_outer_snippet,
-	node_event = node_event,
 }