mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
fix(treesitter): is_in_node_range (#22582)
TS ranges are end column exclusive, so fix is_in_node_range to account for that.
This commit is contained in:
parent
ae70e946ee
commit
be0461e3c2
@ -191,7 +191,7 @@ end
|
|||||||
---
|
---
|
||||||
---@return boolean True if the position is in node range
|
---@return boolean True if the position is in node range
|
||||||
function M.is_in_node_range(node, line, col)
|
function M.is_in_node_range(node, line, col)
|
||||||
return M.node_contains(node, { line, col, line, col })
|
return M.node_contains(node, { line, col, line, col + 1 })
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Determines if a node contains a range
|
--- Determines if a node contains a range
|
||||||
@ -202,7 +202,8 @@ end
|
|||||||
---@return boolean True if the {node} contains the {range}
|
---@return boolean True if the {node} contains the {range}
|
||||||
function M.node_contains(node, range)
|
function M.node_contains(node, range)
|
||||||
vim.validate({
|
vim.validate({
|
||||||
node = { node, 'userdata' },
|
-- allow a table so nodes can be mocked
|
||||||
|
node = { node, { 'userdata', 'table' } },
|
||||||
range = { range, Range.validate, 'integer list with 4 or 6 elements' },
|
range = { range, Range.validate, 'integer list with 4 or 6 elements' },
|
||||||
})
|
})
|
||||||
return Range.contains({ node:range() }, range)
|
return Range.contains({ node:range() }, range)
|
||||||
|
@ -28,4 +28,21 @@ describe('treesitter utils', function()
|
|||||||
eq(true, exec_lua('return vim.treesitter.is_ancestor(ancestor, child)'))
|
eq(true, exec_lua('return vim.treesitter.is_ancestor(ancestor, child)'))
|
||||||
eq(false, exec_lua('return vim.treesitter.is_ancestor(child, ancestor)'))
|
eq(false, exec_lua('return vim.treesitter.is_ancestor(child, ancestor)'))
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('can detect if a position is contained in a node', function()
|
||||||
|
exec_lua([[
|
||||||
|
node = {
|
||||||
|
range = function()
|
||||||
|
return 0, 4, 0, 8
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
]])
|
||||||
|
|
||||||
|
eq(false, exec_lua('return vim.treesitter.is_in_node_range(node, 0, 3)'))
|
||||||
|
for i = 4, 7 do
|
||||||
|
eq(true, exec_lua('return vim.treesitter.is_in_node_range(node, 0, ...)', i))
|
||||||
|
end
|
||||||
|
-- End column exclusive
|
||||||
|
eq(false, exec_lua('return vim.treesitter.is_in_node_range(node, 0, 8)'))
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
|
Loading…
Reference in New Issue
Block a user