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

fix(cli): fix mismatched parenthesis when accounting for &&

Browse source
This commit is contained in:
Sebastian Lackner 2024-04-11 15:01:56 +02:00 • committed by GitHub
parent cbcb51b857
commit 5dc62cc828
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cli/src/generate/render.rs
View file

@ -870,34 +870,32 @@ impl Generator {
line_break.push_str(" ");
}
// parenthesis needed if we add the `!eof` condition to explicitly avoid confusion with
// precedence of `&&` and `||`
let (mut need_open_paren, mut need_close_paren) = (false, false);
for (i, range) in ranges.iter().enumerate() {
if is_included {
if i > 0 {
add!(self, " ||{line_break}");
}
// parenthesis needed if we add the `!eof` condition to explicitly avoid confusion with
// precedence of `&&` and `||`
let mut close_paren = false;
if range.start == '\0' {
add!(self, "!eof && ");
(need_open_paren, need_close_paren) = (true, true);
add!(self, "(!eof && ");
close_paren = true;
}
if range.end == range.start {
if need_open_paren {
add!(self, "(");
need_open_paren = false;
}
add!(self, "lookahead == ");
self.add_character(range.start);
if need_close_paren && i == ranges.len() - 1 {
add!(self, ")");
need_close_paren = false;
}
} else if range.end as u32 == range.start as u32 + 1 {
if close_paren {
add!(self, "(");
}
add!(self, "lookahead == ");
self.add_character(range.start);
add!(self, " ||{line_break}lookahead == ");
self.add_character(range.end);
if close_paren {
add!(self, ")");
}
} else {
add!(self, "(");
self.add_character(range.start);
@ -905,6 +903,9 @@ impl Generator {
self.add_character(range.end);
add!(self, ")");
}
if close_paren {
add!(self, ")");
}
} else {
if i > 0 {
add!(self, " &&{line_break}");