mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): proper tree contains() logic with combined injections

Browse Source 
**Problem:** `LanguageTree:contains()` considers any range within the
start of the first tree and end of the last tree as "within" the
language tree. In the case of combined injections, this is problematic
because we only want to consider ranges within any of the combined trees
as "contained" (as opposed to any range within the entire range spanned
by all combined trees).

**Solution:** Use a more discriminative check in
`LanguageTree:contains()`.
This commit is contained in:
Riley Bruins
2025-05-10 10:07:43 -07:00
committed by Lewis Russell
parent bee45fc0e7
commit de45b8e275
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/treesitter/languagetree.lua
View File

@@ -1287,12 +1287,13 @@ end
local function tree_contains(tree, range)
local tree_ranges = tree:included_ranges(false)
return Range.contains({
tree_ranges[1][1],
tree_ranges[1][2],
tree_ranges[#tree_ranges][3],
tree_ranges[#tree_ranges][4],
}, range)
for _, tree_range in ipairs(tree_ranges) do
if Range.contains(tree_range, range) then
return true
end
end
return false
end
--- Determines whether {range} is contained in the |LanguageTree|.