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

fix(parser): count rows in the debug log from 0

Browse source
This commit is contained in:
Andrew Hlynskyi 2021-07-15 08:26:14 +03:00
parent 9cb732859f
commit 7f538170bf
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/src/tests/parser_test.rs
View file

@ -63,9 +63,14 @@ fn test_parsing_with_logging() {
)));
assert!(messages.contains(&(LogType::Lex, "skip character:' '".to_string())));
let mut row_starts_from_0 = false;
for (_, m) in &messages {
assert!(!m.contains("row:0"));
if m.contains("row:0") {
row_starts_from_0 = true;
break;
}
}
assert!(row_starts_from_0);
}
#[test]

6
lib/src/parser.c
View file

@ -417,7 +417,7 @@ static Subtree ts_parser__lex(
LOG(
"lex_external state:%d, row:%u, column:%u",
lex_mode.external_lex_state,
current_position.extent.row + 1,
current_position.extent.row,
current_position.extent.column
);
ts_lexer_start(&self->lexer);
@ -456,7 +456,7 @@ static Subtree ts_parser__lex(
LOG(
"lex_internal state:%d, row:%u, column:%u",
lex_mode.lex_state,
current_position.extent.row + 1,
current_position.extent.row,
current_position.extent.column
);
ts_lexer_start(&self->lexer);
@ -1884,7 +1884,7 @@ TSTree *ts_parser_parse(
LOG("process version:%d, version_count:%u, state:%d, row:%u, col:%u",
version, ts_stack_version_count(self->stack),
ts_stack_state(self->stack, version),
ts_stack_position(self->stack, version).extent.row + 1,
ts_stack_position(self->stack, version).extent.row,
ts_stack_position(self->stack, version).extent.column);
if (!ts_parser__advance(self, version, allow_node_reuse)) return NULL;