mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(treesitter): introduce child_with_descendant()

Browse Source 
This commit also marks `child_containing_descendant()` as deprecated
(per upstream's documentation), and uses `child_with_descendant()` in
its place. Minimum required tree-sitter version will now be `0.24`.
This commit is contained in:
Riley Bruins
2024-10-02 10:34:14 -07:00
committed by Christian Clason
parent c4762b3097
commit 267c7525f7
9 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/functional/treesitter/node_spec.lua
View File

@@ -186,4 +186,28 @@ describe('treesitter node API', function()
)
eq(vim.NIL, lua_eval('declarator:child_containing_descendant(value)'))
end)
it('child_with_descendant() works', function()
insert([[
int main() {
int x = 3;
}]])
exec_lua(function()
local tree = vim.treesitter.get_parser(0, 'c'):parse()[1]
_G.root = assert(tree:root())
_G.main = assert(_G.root:child(0))
_G.body = assert(_G.main:child(2))
_G.statement = assert(_G.body:child(1))
_G.declarator = assert(_G.statement:child(1))
_G.value = assert(_G.declarator:child(1))
end)
eq(lua_eval('main:type()'), lua_eval('root:child_with_descendant(value):type()'))
eq(lua_eval('body:type()'), lua_eval('main:child_with_descendant(value):type()'))
eq(lua_eval('statement:type()'), lua_eval('body:child_with_descendant(value):type()'))
eq(lua_eval('declarator:type()'), lua_eval('statement:child_with_descendant(value):type()'))
eq(lua_eval('value:type()'), lua_eval('declarator:child_with_descendant(value):type()'))
eq(vim.NIL, lua_eval('value:child_with_descendant(value)'))
end)
end)

14
test/functional/treesitter/query_spec.lua
View File

@@ -405,6 +405,20 @@ void ui_refresh(void)
{ 'literal', 'number_literal', { 0, 8, 0, 11 }, '123' },
{ 'literal', 'number_literal', { 2, 21, 2, 24 }, '125' },
}, result)
result = exec_lua(
get_query_result,
[[((number_literal) @literal (#has-ancestor? @literal "enumerator"))]]
)
eq({
{ 'literal', 'number_literal', { 1, 13, 1, 16 }, '124' },
}, result)
result = exec_lua(
get_query_result,
[[((number_literal) @literal (#has-ancestor? @literal "number_literal"))]]
)
eq({}, result)
end)
it('allows loading query with escaped quotes and capture them `#{lua,vim}-match`?', function()