kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: make InspectTree handle nested injection

Browse Source 
fixup: Use `TSNode:byte_length` instead
This commit is contained in:
Pham Huy Hoang 2023-11-17 11:13:32 +09:00
parent 570367ac83
commit 757bcdda30
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,18 +101,23 @@ function TSTreeView:new(bufnr, lang)
-- the root in the child tree to the {injections} table.
local root = parser:parse(true)[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, {})