language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Better parser recovery for incomplete attributes

Browse source
This commit is contained in:
Lukas Wirth 2024-12-04 06:27:43 +01:00
parent b65911d5ee
commit b6fc9c14ac
8 changed files with 130 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/parser/src/parser.rs
View file

@ -258,22 +258,25 @@ impl<'t> Parser<'t> {
self.err_recover(message, TokenSet::EMPTY);
}
/// Create an error node and consume the next token.
pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) {
/// Create an error node and consume the next token unless it is in the recovery set.
///
/// Returns true if recovery kicked in.
pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) -> bool {
if matches!(self.current(), T!['{'] | T!['}']) {
self.error(message);
return;
return true;
}
if self.at_ts(recovery) {
self.error(message);
return;
return true;
}
let m = self.start();
self.error(message);
self.bump_any();
m.complete(self, ERROR);
false
}
fn do_bump(&mut self, kind: SyntaxKind, n_raw_tokens: u8) {