Allow self-dependent dynamicNode

lua/luasnip/_types.lua

@@ -1,7 +1,6 @@
 ---@alias LuaSnip.Cursor {[1]: number, [2]: number}
 
---- 0-based region within a single line
----@class LuaSnip.MatchRegion
+---@class LuaSnip.MatchRegion 0-based region within a single line
 ---@field row integer 0-based row
 ---@field col_range { [1]: integer, [2]: integer } 0-based column range, from-in, to-exclusive
 

lua/luasnip/config.lua

@@ -101,10 +101,14 @@ c = {
 				require("luasnip").unlink_current_if_deleted
 			)
 		end
-		ls_autocmd(
-			session.config.update_events,
-			require("luasnip").active_update_dependents
-		)
+		ls_autocmd(session.config.update_events, function()
+			-- don't update due to events if an update due to luasnip is pending anyway.
+			-- (Also, this would be bad because luasnip may not be in an
+			-- consistent state whenever an autocommand is triggered)
+			if not session.jump_active then
+				require("luasnip").active_update_dependents()
+			end
+		end)
 		if session.config.region_check_events ~= nil then
 			ls_autocmd(session.config.region_check_events, function()
 				require("luasnip").exit_out_of_region(

lua/luasnip/default_config.lua

@@ -53,6 +53,9 @@ local lazy_snip_env = {
 	k = function()
 		return require("luasnip.nodes.key_indexer").new_key
 	end,
+	opt = function()
+		return require("luasnip.nodes.optional_arg").new_opt
+	end,
 	ai = function()
 		return require("luasnip.nodes.absolute_indexer")
 	end,

lua/luasnip/extras/select_choice.lua

@@ -1,25 +1,52 @@
 local session = require("luasnip.session")
 local ls = require("luasnip")
+local node_util = require("luasnip.nodes.util")
+local feedkeys = require("luasnip.util.feedkeys")
 
-local function set_choice_callback(_, indx)
-	if not indx then
-		return
+-- in this procedure, make sure that api_leave is called before
+-- set_choice_callback exits.
+local function set_choice_callback(data)
+	return function(_, indx)
+		if not indx then
+			ls._api_leave()
+			return
+		end
+		-- set_choice restores cursor from before.
+		ls._set_choice(indx, { cursor_restore_data = data, skip_update = true })
+		ls._api_leave()
 	end
-	-- feed+immediately execute i to enter INSERT after vim.ui.input closes.
-	vim.api.nvim_feedkeys("i", "x", false)
-	ls.set_choice(indx)
 end
 
 local function select_choice()
 	assert(
 		session.active_choice_nodes[vim.api.nvim_get_current_buf()],
 		"No active choiceNode"
 	)
-	vim.ui.select(
-		ls.get_current_choices(),
-		{ kind = "luasnip" },
-		set_choice_callback
+	local active = session.current_nodes[vim.api.nvim_get_current_buf()]
+
+	ls._api_enter()
+
+	ls._active_update_dependents()
+
+	if not session.active_choice_nodes[vim.api.nvim_get_current_buf()] then
+		print("Active choice was removed while updating a dynamicNode.")
+		return
+	end
+
+	local restore_data = node_util.store_cursor_node_relative(
+		active,
+		{ place_cursor_mark = true }
 	)
+
+	-- make sure all movements are done, otherwise the movements may be put into
+	-- the select-dialog.
+	feedkeys.enqueue_action(function()
+		vim.ui.select(
+			ls.get_current_choices(),
+			{ kind = "luasnip" },
+			set_choice_callback(restore_data)
+		)
+	end)
 end
 
 return select_choice