benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-20 04:10:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(predicates): extend has-ancestor?, add has-parent?/has-type?

Browse source
This commit is contained in:
Stephan Seitz 2020-09-12 19:40:16 +02:00 • committed by Thomas Vigouroux
parent 00d5408527
commit f4979e5379
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lua/nvim-treesitter/query_predicates.lua
View file

@ -32,22 +32,31 @@ query.add_predicate("nth?", function(match, pattern, bufnr, pred)
return false return false
end) end)
query.add_predicate('has-ancestor?', function(match, pattern, bufnr, pred) local function has_ancestor(match, pattern, bufnr, pred)
if not valid_args("has-ancestor?", pred, 2, true) then return end if not valid_args(pred[1], pred, 2) then return end
local node = match[pred[2]] local node = match[pred[2]]
local ancestor_type = pred[3] local ancestor_types = {unpack(pred, 3)}
if not node then return true end if not node then return true end
local just_direct_parent = pred[1]:find('has-parent', 1, true)
node = node:parent() node = node:parent()
while node do while node do
if node:type() == ancestor_type then if vim.tbl_contains(ancestor_types, node:type()) then
return true return true
end end
node = node:parent() if just_direct_parent then
node = nil
else
node = node:parent()
end
end end
return false return false
end) end
query.add_predicate('has-ancestor?', has_ancestor)
query.add_predicate('has-parent?', has_ancestor)
query.add_predicate('is?', function(match, pattern, bufnr, pred) query.add_predicate('is?', function(match, pattern, bufnr, pred)
if not valid_args("is?", pred, 2) then return end if not valid_args("is?", pred, 2) then return end
@ -64,6 +73,17 @@ query.add_predicate('is?', function(match, pattern, bufnr, pred)
return vim.tbl_contains(types, kind) return vim.tbl_contains(types, kind)
end) end)
query.add_predicate('has-type?', function(match, pattern, bufnr, pred)
if not valid_args(pred[1], pred, 2) then return end
local node = match[pred[2]]
local types = {unpack(pred, 3)}
if not node then return true end
return vim.tbl_contains(types, node:type())
end)
-- Just avoid some anoying warnings for this predicate -- Just avoid some anoying warnings for this predicate
query.add_predicate('set!', function() return true end) query.add_predicate('set!', function() return true end)
query.add_predicate('make-range!', function() return true end) query.add_predicate('make-range!', function() return true end)