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

Handle multiple top-level alternations correctly

Browse source
This commit is contained in:
Hendrik van Antwerpen 2022-01-11 18:06:28 +01:00
parent 8b28f3a8c4
commit ec9b00e5c6
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4003,6 +4003,24 @@ fn test_capture_quantifiers() {
(3, "z", CaptureQuantifier::Zero),
],
},
Row {
description: "multiple alternatives",
language: get_language("javascript"),
pattern: r#"
[
(array (identifier) @x)
(function_declaration name: (identifier)+ @x)
]
[
(array (identifier) @x)
(function_declaration name: (identifier)+ @x)
]
"#,
capture_quantifiers: &[
(0, "x", CaptureQuantifier::OneOrMore),
(1, "x", CaptureQuantifier::OneOrMore),
],
},
];
allocations::record(|| {

2
lib/src/query.c
View file

@ -1990,7 +1990,7 @@ static TSQueryError ts_query__parse_pattern(
return e;
}
if(start_index == 0) {
if(start_index == starting_step_index) {
capture_quantifiers_replace(capture_quantifiers, &branch_capture_quantifiers);
} else {
capture_quantifiers_join_all(capture_quantifiers, &branch_capture_quantifiers);