mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-29 16:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): remove default match limit (#39696)

Browse Source 
Problem: The default match limit of 256 can be too low for realistic
use cases, but was necessary to guard against catastrophic
performance cliffs.

Solution: Performance cliffs were fixed in upstream tree-sitter 0.27+,
so remove the fallback limit to return unlimited matches by default.
This commit is contained in:
Will Lillis
2026-05-09 06:19:21 -04:00
committed by GitHub
parent ef84ec69aa
commit b44c2bdd16
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/lua/vim/treesitter/query.lua
View File

@@ -917,7 +917,7 @@ end
---@param end_row? integer Stopping line for the search (end-inclusive, unless `stop_col` is provided). Defaults to `node:end_()`.
---@param opts? table Optional keyword arguments:
--- - end_col (integer) Stopping column for the search (end-exclusive).
--- - match_limit (integer) Set the maximum number of in-progress matches (Default: 256).
--- - match_limit (integer) Set the maximum number of in-progress matches (Default: none).
--- - max_start_depth (integer) if non-zero, sets the maximum start depth
--- for each match. This is used to prevent traversing too deep into a tree.
--- - start_col (integer) Starting column for the search.
@@ -928,7 +928,6 @@ end
---@note Captures are only returned if the query pattern of a specific capture contained predicates.
function Query:iter_captures(node, source, start_row, end_row, opts)
opts = opts or {}
opts.match_limit = opts.match_limit or 256
if type(source) == 'number' and source == 0 then
source = api.nvim_get_current_buf()
@@ -943,7 +942,7 @@ function Query:iter_captures(node, source, start_row, end_row, opts)
end_row = end_row,
end_col = opts.end_col or 0,
max_start_depth = opts.max_start_depth,
match_limit = opts.match_limit or 256,
match_limit = opts.match_limit,
})
-- For faster checks that a match is not in the cache.
@@ -1037,14 +1036,13 @@ end
---@param start? integer Starting line for the search. Defaults to `node:start()`.
---@param stop? integer Stopping line for the search (end-exclusive). Defaults to `node:end_()`.
---@param opts? table Optional keyword arguments:
--- - match_limit (integer) Set the maximum number of in-progress matches (Default: 256).
--- - match_limit (integer) Set the maximum number of in-progress matches (Default: none).
--- - max_start_depth (integer) if non-zero, sets the maximum start depth
--- for each match. This is used to prevent traversing too deep into a tree.
---
---@return (fun(): integer, table<integer, TSNode[]>, vim.treesitter.query.TSMetadata, TSTree): pattern id, match, metadata, tree
function Query:iter_matches(node, source, start, stop, opts)
opts = opts or {}
opts.match_limit = opts.match_limit or 256
if type(source) == 'number' and source == 0 then
source = api.nvim_get_current_buf()
@@ -1059,7 +1057,7 @@ function Query:iter_matches(node, source, start, stop, opts)
end_row = stop,
end_col = 0,
max_start_depth = opts.max_start_depth,
match_limit = opts.match_limit or 256,
match_limit = opts.match_limit,
})
local function iter()