mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-09 19:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26299 from neovim/backport-26085-to-release-0.9

Browse Source 
[Backport release-0.9] fix(treesitter): make InspectTree correctly handle nested injections
This commit is contained in:
Christian Clason
2023-11-29 15:34:06 +01:00
committed by GitHub
parent 8b9d6e8d63 753f8bcaab
commit 76d79c1ce3
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
runtime/lua/vim/treesitter/playground.lua
View File

@@ -102,18 +102,23 @@ function TSPlayground:new(bufnr, lang)
-- the root in the child tree to the {injections} table.
local root = parser:parse()[1]:root()
local injections = {} ---@type table<integer,table>
for _, child in pairs(parser:children()) do
child:for_each_tree(function(tree, ltree)
local r = tree:root()
local node = root:named_descendant_for_range(r:range())
if node then
injections[node:id()] = {
lang = ltree:lang(),
root = r,
}
end
end)
end
parser:for_each_tree(function(parent_tree, parent_ltree)
local parent = parent_tree:root()
for _, child in pairs(parent_ltree:children()) do
child:for_each_tree(function(tree, ltree)
local r = tree:root()
local node = assert(parent:named_descendant_for_range(r:range()))
local id = node:id()
if not injections[id] or r:byte_length() > injections[id].root:byte_length() then
injections[id] = {
lang = ltree:lang(),
root = r,
}
end
end)
end
end)
local nodes = traverse(root, 0, parser:lang(), injections, {})