Merge branch 'master' into add-MANY-types

Author: bew

DOC.md

@@ -3072,7 +3072,7 @@ these files.
 By default, the names from [`luasnip.config.snip_env`][snip-env-src] will be used, but it's
 possible to customize them by setting `snip_env` in `setup`.  
 
-[snip-env-src]: https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48
+[snip-env-src]: https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/default_config.lua#L22-L104
 
 
 **Example**:

README.md

@@ -66,6 +66,11 @@ Neovim >= 0.7 (extmarks)
 > specify the `CC` variable in the build command: `make install_jsregexp
 > CC=your_compiler_program`. Also, make sure `%GIT%/bin` directory is added in
 > the `$PATH` so that `make` can use `%GIT%/bin/sh.exe`.
+> 
+> On FreeBSD (and/or systems that do not install the GNU make package as the default)
+> make commands will fail as the Makefile does not align with the expected syntax of the
+> BSD variant of make. The solution is to install the GNU variant of make:
+> 'pkg install gmake' on FreeBSD.
 
 ## Keymaps
 In Vim script, with `<Tab>` for jumping forward/expanding a snippet, `<Shift-Tab>` for

data/DOC-template.md

@@ -3037,7 +3037,7 @@ these files.
 By default, the names from [`luasnip.config.snip_env`][snip-env-src] will be used, but it's
 possible to customize them by setting `snip_env` in `setup`.  
 
-[snip-env-src]: https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48
+[snip-env-src]: https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/default_config.lua#L22-L104
 
 
 **Example**:

doc/luasnip.txt

@@ -1,4 +1,4 @@
-*luasnip.txt*         For NeoVim 0.7-0.11         Last change: 2026 January 10
+*luasnip.txt*          For NeoVim 0.7-0.11          Last change: 2026 April 05
 
 ==============================================================================
 Table of Contents                                  *luasnip-table-of-contents*
@@ -123,7 +123,7 @@ As noted in the |luasnip-loaders-lua|-section:
 
 
   By default, the names from
-  [`luasnip.config.snip_env`](https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48)
+  [`luasnip.config.snip_env`](https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/default_config.lua#L22-L104)
   will be used, but it’s possible to customize them by setting `snip_env` in
   `setup`.
 Furthermore, note that while this document assumes you have defined `ls` to be
@@ -2982,7 +2982,7 @@ There are two ways to add snippets:
 As defining all of the snippet constructors (`s`, `c`, `t`, …) in every file
 is rather cumbersome, LuaSnip will bring some globals into scope for executing
 these files. By default, the names from
-[`luasnip.config.snip_env`](https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/config.lua#L22-L48)
+[`luasnip.config.snip_env`](https://github.com/L3MON4D3/LuaSnip/blob/master/lua/luasnip/default_config.lua#L22-L104)
 will be used, but it’s possible to customize them by setting `snip_env` in
 `setup`.
 

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
@@ -29,7 +54,7 @@ end
 
 ---@param bufnr number
 ---@param region LuaSnip.MatchRegion
----@return LanguageTree, string
+---@return vim.treesitter.LanguageTree, string
 local function reparse_buffer_after_removing_match(bufnr, region)
 	local lang = get_lang(bufnr)
 
@@ -45,7 +70,7 @@ local function reparse_buffer_after_removing_match(bufnr, region)
 
 	local source = table.concat(lines, "\n")
 
-	---@type LanguageTree
+	---@type vim.treesitter.LanguageTree
 	local parser = vim.treesitter.get_string_parser(source, lang, nil)
 	if parser then
 		parser:parse()
@@ -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)
@@ -260,12 +283,12 @@ local builtin_tsnode_selectors = {
 }
 
 ---@class LuaSnip.extra.TSParser
----@field parser LanguageTree
+---@field parser vim.treesitter.LanguageTree
 ---@field source string|number
 local TSParser = {}
 
 ---@param bufnr number?
----@param parser LanguageTree
+---@param parser vim.treesitter.LanguageTree
 ---@param source string|number
 ---@return LuaSnip.extra.TSParser?
 function TSParser.new(bufnr, parser, source)
@@ -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/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
@@ -137,7 +138,7 @@ local function generate_resolve_expand_param(match_tsnode, user_resolver)
 	---@param line_to_cursor string
 	---@param matched_trigger string
 	---@param captures any
-	---@param parser LanguageTree
+	---@param parser vim.treesitter.LanguageTree
 	---@param source number|string
 	---@param bufnr number
 	---@param pos { [1]: number, [2]: number }

lua/luasnip/util/extend_decorator.lua

@@ -40,7 +40,7 @@ end
 ---  	{key = "and opts1 with this"}
 ---  )
 ---  ```
----@return T The decorated function.
+---@return T _ The decorated function.
 function M.apply(fn, ...)
 	local extend_properties = function_properties[fn]
 	assert(

lua/luasnip/util/mark.lua

@@ -130,37 +130,6 @@ function Mark:copy_pos_gravs(opts)
 	return mark(pos_beg, pos_end, opts)
 end
 
---- Update the extmark with the given opts & positions.
----
---- note: opts as first arg because positions are pretty likely to stay the same.
----
----@param opts vim.api.keyset.set_extmark
----@param pos_begin LuaSnip.RawPos0
----@param pos_end LuaSnip.RawPos0
-function Mark:update(opts, pos_begin, pos_end)
-	-- if one is changed, the other is likely as well.
-	if not pos_begin then
-		-- FIXME(@bew): old_pos_begin & old_pos_end don't exist??
-		pos_begin = old_pos_begin
-		if not pos_end then
-			pos_end = old_pos_end
-		end
-	end
-	-- override with new.
-	self.opts = vim.tbl_extend("force", self.opts, opts)
-	vim.api.nvim_buf_set_extmark(
-		0,
-		session.ns_id,
-		pos_begin[1],
-		pos_begin[2],
-		vim.tbl_extend(
-			"force",
-			self.opts,
-			{ id = self.id, end_line = pos_end[1], end_col = pos_end[2] }
-		)
-	)
-end
-
 ---@param opts vim.api.keyset.set_extmark
 function Mark:set_opts(opts)
 	local pos_begin, pos_end = self:pos_begin_end_raw()