traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug in maintenance of query cursor's tree depth

Browse source
This commit is contained in:
Max Brunsfeld 2023-02-15 14:40:36 -08:00
parent bd63fb2a0d
commit 40703f110c
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/src/tests/query_test.rs
View file

@ -1876,7 +1876,6 @@ fn test_query_matches_within_byte_range() {
cursor
.set_byte_range(0..8)
.matches(&query, tree.root_node(), source.as_bytes());
assert_eq!(
collect_matches(matches, &query, source),
&[
@ -1890,7 +1889,6 @@ fn test_query_matches_within_byte_range() {
cursor
.set_byte_range(5..15)
.matches(&query, tree.root_node(), source.as_bytes());
assert_eq!(
collect_matches(matches, &query, source),
&[
@ -1904,7 +1902,6 @@ fn test_query_matches_within_byte_range() {
cursor
.set_byte_range(12..0)
.matches(&query, tree.root_node(), source.as_bytes());
assert_eq!(
collect_matches(matches, &query, source),
&[

24
lib/src/query.c
View file

@ -3393,21 +3393,28 @@ static inline bool ts_query_cursor__advance(
// Exit the current node.
if (self->ascending) {
LOG(
"leave node. depth:%u, type:%s\n",
self->depth,
ts_node_type(ts_tree_cursor_current_node(&self->cursor))
);
if (self->on_visible_node) {
LOG(
"leave node. depth:%u, type:%s\n",
self->depth,
ts_node_type(ts_tree_cursor_current_node(&self->cursor))
);
}
// Leave this node by stepping to its next sibling or to its parent.
switch (ts_tree_cursor_goto_next_sibling_internal(&self->cursor)) {
case TreeCursorStepVisible:
self->on_visible_node = true;
if (!self->on_visible_node) {
self->depth++;
self->on_visible_node = true;
}
self->ascending = false;
break;
case TreeCursorStepHidden:
self->depth--;
self->on_visible_node = false;
if (self->on_visible_node) {
self->depth--;
self->on_visible_node = false;
}
self->ascending = false;
break;
default:
@ -3467,7 +3474,6 @@ static inline bool ts_query_cursor__advance(
// Get the properties of the current node.
TSNode node = ts_tree_cursor_current_node(&self->cursor);
TSNode parent_node = ts_tree_cursor_parent_node(&self->cursor);
bool parent_precedes_range = !ts_node_is_null(parent_node) && (
ts_node_end_byte(parent_node) <= self->start_byte ||
point_lte(ts_node_end_point(parent_node), self->start_point)