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

fix(cli): correct traversal behavior for finding error nodes

Browse source
This commit is contained in:
Amaan Qureshi 2025-01-25 19:57:40 -05:00
parent 4b6723192e
commit 4940d2c29b
1 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cli/src/parse.rs
View file

@ -634,14 +634,39 @@ pub fn parse_file_at_path(
}
let mut first_error = None;
loop {
let mut earliest_node_with_error = None;
'outer: loop {
let node = cursor.node();
if node.has_error() {
if earliest_node_with_error.is_none() {
earliest_node_with_error = Some(node);
}
if node.is_error() || node.is_missing() {
first_error = Some(node);
break;
}
// If there's no more children, even though some outer node has an error,
// then that means that the first error is hidden, but the later error could be
// visible. So, we walk back up to the child of the first node with an error,
// and then check its siblings for errors.
if !cursor.goto_first_child() {
let earliest = earliest_node_with_error.unwrap();
while cursor.goto_parent() {
if cursor.node().parent().is_some_and(|p| p == earliest) {
while cursor.goto_next_sibling() {
let sibling = cursor.node();
if sibling.is_error() || sibling.is_missing() {
first_error = Some(sibling);
break 'outer;
}
if sibling.has_error() && cursor.goto_first_child() {
continue 'outer;
}
}
break;
}
}
break;
}
} else if !cursor.goto_next_sibling() {