feat(treesitter): introduce child_with_descendant()

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

View File

@@ -828,6 +828,7 @@ static struct luaL_Reg node_meta[] = {
{ "parent", node_parent },
{ "__has_ancestor", __has_ancestor },
{ "child_containing_descendant", node_child_containing_descendant },
{ "child_with_descendant", node_child_with_descendant },
{ "iter_children", node_iter_children },
{ "next_sibling", node_next_sibling },
{ "prev_sibling", node_prev_sibling },
@@ -1146,7 +1147,7 @@ static int __has_ancestor(lua_State *L)
int const pred_len = (int)lua_objlen(L, 2);
TSNode node = ts_tree_root_node(descendant.tree);
while (!ts_node_is_null(node)) {
while (node.id != descendant.id) {
char const *node_type = ts_node_type(node);
size_t node_type_len = strlen(node_type);
@@ -1163,7 +1164,7 @@ static int __has_ancestor(lua_State *L)
lua_pop(L, 1);
}
node = ts_node_child_containing_descendant(node, descendant);
node = ts_node_child_with_descendant(node, descendant);
}
lua_pushboolean(L, false);
@@ -1179,6 +1180,15 @@ static int node_child_containing_descendant(lua_State *L)
return 1;
}
static int node_child_with_descendant(lua_State *L)
{
TSNode node = node_check(L, 1);
TSNode descendant = node_check(L, 2);
TSNode child = ts_node_child_with_descendant(node, descendant);
push_node(L, child, 1);
return 1;
}
static int node_next_sibling(lua_State *L)
{
TSNode node = node_check(L, 1);