Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recover from missing semicolon based on the found token #59866

Merged
merged 2 commits into from
Apr 13, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,10 @@ impl<'a> Parser<'a> {
.chain(inedible.iter().map(|x| TokenType::Token(x.clone())))
.chain(self.expected_tokens.iter().cloned())
.collect::<Vec<_>>();
let expects_semi = expected.iter().any(|t| match t {
TokenType::Token(token::Semi) => true,
_ => false,
});
expected.sort_by_cached_key(|x| x.to_string());
expected.dedup();
let expect = tokens_to_string(&expected[..]);
Expand Down Expand Up @@ -835,6 +839,17 @@ impl<'a> Parser<'a> {
Applicability::MaybeIncorrect,
);
}
let is_semi_suggestable = expects_semi && (
self.token.is_keyword(keywords::Break) ||
self.token.is_keyword(keywords::Continue) ||
self.token.is_keyword(keywords::For) ||
self.token.is_keyword(keywords::If) ||
self.token.is_keyword(keywords::Let) ||
self.token.is_keyword(keywords::Loop) ||
self.token.is_keyword(keywords::Match) ||
self.token.is_keyword(keywords::Return) ||
self.token.is_keyword(keywords::While)
);
let sp = if self.token == token::Token::Eof {
// This is EOF, don't want to point at the following char, but rather the last token
self.prev_span
Expand All @@ -853,6 +868,18 @@ impl<'a> Parser<'a> {

let cm = self.sess.source_map();
match (cm.lookup_line(self.span.lo()), cm.lookup_line(sp.lo())) {
(Ok(ref a), Ok(ref b)) if a.line != b.line && is_semi_suggestable => {
estebank marked this conversation as resolved.
Show resolved Hide resolved
// The spans are in different lines, expected `;` and found `let` or `return`.
// High likelihood that it is only a missing `;`.
err.span_suggestion_short(
label_sp,
"missing semicolon here",
";".to_string(),
Applicability::MaybeIncorrect,
);
err.emit();
return Ok(true);
}
(Ok(ref a), Ok(ref b)) if a.line == b.line => {
// When the spans are in the same line, it means that the only content between
// them is whitespace, point at the found token in that case:
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/parser/recover-missing-semi.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
fn main() {
let _: usize = ()
//~^ ERROR mismatched types
let _ = 3;
//~^ ERROR expected one of
}

fn foo() -> usize {
let _: usize = ()
//~^ ERROR mismatched types
return 3;
//~^ ERROR expected one of
}
39 changes: 39 additions & 0 deletions src/test/ui/parser/recover-missing-semi.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
error: expected one of `.`, `;`, `?`, or an operator, found `let`
--> $DIR/recover-missing-semi.rs:4:5
|
LL | let _: usize = ()
| - help: missing semicolon here
LL |
LL | let _ = 3;
| ^^^

error: expected one of `.`, `;`, `?`, or an operator, found `return`
--> $DIR/recover-missing-semi.rs:11:5
|
LL | let _: usize = ()
| - help: missing semicolon here
LL |
LL | return 3;
| ^^^^^^

error[E0308]: mismatched types
--> $DIR/recover-missing-semi.rs:2:20
|
LL | let _: usize = ()
| ^^ expected usize, found ()
|
= note: expected type `usize`
found type `()`

error[E0308]: mismatched types
--> $DIR/recover-missing-semi.rs:9:20
|
LL | let _: usize = ()
| ^^ expected usize, found ()
|
= note: expected type `usize`
found type `()`

error: aborting due to 4 previous errors

For more information about this error, try `rustc --explain E0308`.