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

better recovery for exprs

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-28 11:12:42 +03:00
parent 13110f48e9
commit 2fa90e736b
16 changed files with 263 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
RETURN_KW, IDENT, SELF_KW, SUPER_KW, COLONCOLON, BREAK_KW, CONTINUE_KW, LIFETIME ],
];
const EXPR_RECOVERY_SET: TokenSet =
token_set![LET_KW];
pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> {
match literal(p) {
Some(m) => return Some(m),
@ -73,7 +76,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<CompletedMark
CONTINUE_KW => continue_expr(p),
BREAK_KW => break_expr(p),
_ => {
p.err_and_bump("expected expression");
p.err_recover("expected expression", EXPR_RECOVERY_SET);
return None;
}
};