Merge branch 'master' into types-for-mark-pos

Author: bew

doc/luasnip.txt

@@ -1,4 +1,4 @@
-*luasnip.txt*         For NeoVim 0.7-0.11         Last change: 2026 January 23
+*luasnip.txt*          For NeoVim 0.7-0.11          Last change: 2026 April 05
 
 ==============================================================================
 Table of Contents                                  *luasnip-table-of-contents*

lua/luasnip/extras/_treesitter.lua

@@ -7,6 +7,31 @@ local function get_lang(bufnr)
 	return lang
 end
 
+---Returns the parser for a specific buffer and attaches it to the buffer
+---
+---If needed, this will create the parser.
+---
+---If no parser can be created, nil (and an error message) is returned.
+---
+---This is a wrapper around Neovim's `vim.treesitter.get_parser()`, to normalize
+---the behavior of the old and new versions. The old version threw errors, the
+---new version returns them as values. This wrapper normalizes both to the new
+---version.
+---@param bufnr integer|nil Buffer the parser should be tied to (default: current buffer)
+---@param lang string|nil Language of this parser (default: from buffer filetype)
+---@param opts table|nil Options to pass to the created language tree
+---@return vim.treesitter.LanguageTree? object to use for parsing
+---@return string? error message, if applicable
+local function get_parser(bufnr, lang, opts)
+	local has_parser, parser_or_err, err =
+		pcall(vim.treesitter.get_parser, bufnr, lang, opts)
+	if not has_parser then
+		return nil, tostring(parser_or_err)
+	end
+
+	return parser_or_err, err
+end
+
 -- Inspect node
 ---@param node TSNode?
 ---@return string
@@ -85,13 +110,12 @@ function FixBufferContext:enter()
 		{ "" }
 	)
 
-	local parser, source =
-		vim.treesitter.get_parser(self.ori_bufnr), self.ori_bufnr
+	local parser = get_parser(self.ori_bufnr)
 	if parser then
 		parser:parse()
 	end
 
-	return parser, source
+	return parser, self.ori_bufnr
 end
 
 function FixBufferContext:leave()
@@ -113,12 +137,11 @@ function FixBufferContext:leave()
 		{ self.region.row + 1, self.region.col_range[2] }
 	)
 
-	local parser, source =
-		vim.treesitter.get_parser(self.ori_bufnr), self.ori_bufnr
+	local parser = get_parser(self.ori_bufnr)
 	if parser then
 		parser:parse()
 	end
-	return parser, source
+	return parser, self.ori_bufnr
 end
 
 local function capture_to_node(capture)
@@ -439,6 +462,7 @@ end
 
 return {
 	get_lang = get_lang,
+	get_parser = get_parser,
 	reparse_buffer_after_removing_match = reparse_buffer_after_removing_match,
 	TSParser = TSParser,
 	FixBufferContext = FixBufferContext,

lua/luasnip/extras/filetype_functions.lua

@@ -12,10 +12,9 @@ local function fts_from_ts_lang(lang)
 end
 
 local function from_cursor_pos()
-	-- get_parser errors if parser not present (no grammar for language).
-	local has_parser, parser = pcall(vim.treesitter.get_parser)
+	local parser = require("luasnip.extras._treesitter").get_parser()
 
-	if has_parser then
+	if parser then
 		local cursor = require("luasnip.util.util").get_cursor_0ind()
 		-- assumption: languagetree uses 0-indexed byte-ranges.
 		local lang = parser

lua/luasnip/extras/fmt.lua

@@ -1,29 +1,9 @@
 local text_node = require("luasnip.nodes.textNode").T
-local wrap_nodes = require("luasnip.util.util").wrap_nodes
+local util = require("luasnip.util.util")
 local extend_decorator = require("luasnip.util.extend_decorator")
 local Str = require("luasnip.util.str")
 local rp = require("luasnip.extras").rep
 
--- https://gist.github.com/tylerneylon/81333721109155b2d244
-local function copy3(obj, seen)
-	-- Handle non-tables and previously-seen tables.
-	if type(obj) ~= "table" then
-		return obj
-	end
-	if seen and seen[obj] then
-		return seen[obj]
-	end
-
-	-- New table; mark it as seen an copy recursively.
-	local s = seen or {}
-	local res = {}
-	s[obj] = res
-	for k, v in next, obj do
-		res[copy3(k, s)] = copy3(v, s)
-	end
-	return setmetatable(res, getmetatable(obj))
-end
-
 -- Interpolate elements from `args` into format string with placeholders.
 --
 -- The placeholder syntax for selecting from `args` is similar to fmtlib and
@@ -102,7 +82,7 @@ local function interpolate(fmt, args, opts)
 		if used_keys[key] then
 			local jump_index = args[key]:get_jump_index() -- For nodes that don't have a jump index, copy it instead
 			if not opts.repeat_duplicates or jump_index == nil then
-				table.insert(elements, copy3(args[key]))
+				table.insert(elements, util.copy3(args[key]))
 			else
 				table.insert(elements, rp(jump_index))
 			end
@@ -198,7 +178,7 @@ local function format_nodes(str, nodes, opts)
 	opts = vim.tbl_extend("force", defaults, opts or {})
 
 	-- allow to pass a single node
-	nodes = wrap_nodes(nodes)
+	nodes = util.wrap_nodes(nodes)
 
 	-- optimization: avoid splitting multiple times
 	local lines = nil

lua/luasnip/extras/snip_location.lua

@@ -12,9 +12,10 @@ local M = {}
 -- return: 4-tuple, {start_line, start_col, end_line, end_col}, range of
 -- function-call.
 local function lua_find_function_call_node_at(bufnr, line)
-	local has_parser, parser = pcall(vim.treesitter.get_parser, bufnr, "lua")
-	if not has_parser then
-		error("Error while getting parser: " .. parser)
+	local parser, err =
+		require("luasnip.extras._treesitter").get_parser(bufnr, "lua")
+	if not parser then
+		error("Error while getting parser: " .. err)
 	end
 
 	local root = parser:parse()[1]:root()
@@ -56,9 +57,10 @@ local function range_highlight(line_start, line_end, hl_duration_ms)
 end
 
 local function json_find_snippet_definition(bufnr, filetype, snippet_name)
-	local parser_ok, parser = pcall(vim.treesitter.get_parser, bufnr, filetype)
-	if not parser_ok then
-		error("Error while getting parser: " .. parser)
+	local parser, err =
+		require("luasnip.extras._treesitter").get_parser(bufnr, filetype)
+	if not parser then
+		error("Error while getting parser: " .. err)
 	end
 
 	local root = parser:parse()[1]:root()

lua/luasnip/extras/treesitter_postfix.lua

@@ -77,7 +77,8 @@ local function make_reparse_enter_and_leave_func(
 		end
 	else
 		return function()
-			local parser = vim.treesitter.get_parser(bufnr)
+			local parser =
+				require("luasnip.extras._treesitter").get_parser(bufnr)
 			if parser then
 				parser:parse()
 			end

lua/luasnip/nodes/snippet.lua

@@ -859,28 +859,8 @@ function Snippet:matches(line_to_cursor, opts)
 	return expand_params
 end
 
--- https://gist.github.com/tylerneylon/81333721109155b2d244
-local function copy3(obj, seen)
-	-- Handle non-tables and previously-seen tables.
-	if type(obj) ~= "table" then
-		return obj
-	end
-	if seen and seen[obj] then
-		return seen[obj]
-	end
-
-	-- New table; mark it as seen an copy recursively.
-	local s = seen or {}
-	local res = {}
-	s[obj] = res
-	for k, v in next, obj do
-		res[copy3(k, s)] = copy3(v, s)
-	end
-	return setmetatable(res, getmetatable(obj))
-end
-
 function Snippet:copy()
-	return copy3(self)
+	return util.copy3(self)
 end
 
 function Snippet:del_marks()

lua/luasnip/util/util.lua

@@ -70,7 +70,7 @@ end
 --- by.
 ---@param parent_indent_displaycolumns number, displaycolumn this text is
 --- already at.
----@return string[], `text` (only for simple nesting).
+---@return string[] _ `text` (only for simple nesting).
 local function expand_tabs(text, tabwidth, parent_indent_displaycolumns)
 	for i, line in ipairs(text) do
 		local new_line = ""
@@ -258,7 +258,7 @@ local function to_line_table(table_or_string)
 	-- split entries at \n.
 	local line_table = {}
 	for _, str in ipairs(tbl) do
-		local split = vim.split(str, "\n", true)
+		local split = vim.split(str, "\n", { plain = true })
 		for i = 1, #split do
 			line_table[#line_table + 1] = split[i]
 		end
@@ -472,6 +472,32 @@ local function shallow_copy(t)
 	return t
 end
 
+--- Deepcopy given table, with support for recursive tables & metatable.
+--- Taken from: https://gist.github.com/tylerneylon/81333721109155b2d244
+---
+---@generic T: table
+---@param obj T
+---@param seen? table
+---@return T
+local function copy3(obj, seen)
+	-- Handle non-tables and previously-seen tables.
+	if type(obj) ~= "table" then
+		return obj
+	end
+	if seen and seen[obj] then
+		return seen[obj]
+	end
+
+	-- New table; mark it as seen an copy recursively.
+	local s = seen or {}
+	local res = {}
+	s[obj] = res
+	for k, v in next, obj do
+		res[copy3(k, s)] = copy3(v, s)
+	end
+	return setmetatable(res, getmetatable(obj))
+end
+
 return {
 	get_cursor_0ind = get_cursor_0ind,
 	set_cursor_0ind = set_cursor_0ind,
@@ -515,4 +541,5 @@ return {
 	pos_offset = pos_offset,
 	pos_from_offset = pos_from_offset,
 	shallow_copy = shallow_copy,
+	copy3 = copy3,
 }