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

fix(lib): an empty root node should not precede an empty range

Browse source 
The problem is, given an empty file, the root node of this file spans 0
bytes. As such, the logic for determining whether or not the node
precedes the range fails, and is true when it should be false.
This commit is contained in:
Amaan Qureshi 2024-07-04 20:14:52 -04:00
parent 2bb20fe2fe
commit 6dd459b4ab
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5194,3 +5194,17 @@ fn test_query_wildcard_with_immediate_first_child() {
],
);
}
#[test]
fn test_query_on_empty_source_code() {
let language = get_language("javascript");
let source_code = "";
let query = r#"(program) @program"#;
let query = Query::new(&language, query).unwrap();
assert_query_matches(
&language,
&query,
source_code,
&[(0, vec![("program", "")])],
);
}

22
lib/src/query.c
View file

@ -3541,6 +3541,13 @@ 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);
uint32_t start_byte = ts_node_start_byte(node);
uint32_t end_byte = ts_node_end_byte(node);
TSPoint start_point = ts_node_start_point(node);
TSPoint end_point = ts_node_end_point(node);
bool is_empty = start_byte == end_byte;
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)
@ -3549,13 +3556,16 @@ static inline bool ts_query_cursor__advance(
ts_node_start_byte(parent_node) >= self->end_byte ||
point_gte(ts_node_start_point(parent_node), self->end_point)
);
bool node_precedes_range = parent_precedes_range || (
ts_node_end_byte(node) <= self->start_byte ||
point_lte(ts_node_end_point(node), self->start_point)
);
bool node_precedes_range =
parent_precedes_range ||
end_byte < self->start_byte ||
point_lt(end_point, self->start_point) ||
(!is_empty && end_byte == self->start_byte) ||
(!is_empty && point_eq(end_point, self->start_point));
bool node_follows_range = parent_follows_range || (
ts_node_start_byte(node) >= self->end_byte ||
point_gte(ts_node_start_point(node), self->end_point)
start_byte >= self->end_byte ||
point_gte(start_point, self->end_point)
);
bool parent_intersects_range = !parent_precedes_range && !parent_follows_range;
bool node_intersects_range = !node_precedes_range && !node_follows_range;