language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix stuck parser

Browse source
This commit is contained in:
Aleksey Kladov 2018-09-08 10:13:32 +03:00
parent 44334f6f56
commit bd3a26493f
7 changed files with 719 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/libsyntax2/src/grammar/expressions/atom.rs
View file

@ -140,9 +140,14 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
}
while !p.at(EOF) && !p.at(R_BRACK) {
p.expect(COMMA);
if !p.at(R_BRACK) {
expr(p);
if p.at(R_BRACK) {
break;
}
if !EXPR_FIRST.contains(p.current()) {
p.error("expected expression");
break;
}
expr(p);
}
p.expect(R_BRACK);
m.complete(p, ARRAY_EXPR)

4
crates/libsyntax2/src/grammar/expressions/mod.rs
View file

@ -376,6 +376,10 @@ fn arg_list(p: &mut Parser) {
let m = p.start();
p.bump();
while !p.at(R_PAREN) && !p.at(EOF) {
if !EXPR_FIRST.contains(p.current()) {
p.error("expected expression");
break;
}
expr(p);
if !p.at(R_PAREN) && !p.expect(COMMA) {
break;