neovim

commit de45b8e2754f595eb675bd8068b4f9fc7af8d268
parent bee45fc0e7801396951cd156c82953cbadc256b9
Author: Riley Bruins <ribru17@hotmail.com>
Date:   Sat, 10 May 2025 10:07:43 -0700

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

**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()`.

Diffstat:
M
runtime/lua/vim/treesitter/languagetree.lua
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
@@ -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|.