From: Zack M. Davis <code@zackmdavis.net>
Date: Thu, 22 Mar 2018 04:54:06 +0000 (-0700)
Subject: don't suggest placing code in block if next token is open-brace
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=944c4017365e0974e7b8c5b52ce2d267e3ab3e4c;p=rust.git

don't suggest placing code in block if next token is open-brace

Thanks to the inestimably inimitable Esteban "Estebank" Küber for
pointing this out.

This is relevant to #46836.
---

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index e6da5bcaa3a..05c6c1352b2 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4486,6 +4486,11 @@ pub fn parse_block(&mut self) -> PResult<'a, P<Block>> {
             // Which is valid in other languages, but not Rust.
             match self.parse_stmt_without_recovery(false) {
                 Ok(Some(stmt)) => {
+                    if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace)) {
+                        // if the next token is an open brace (e.g., `if a b {`), the place-
+                        // inside-a-block suggestion would be more likely wrong than right
+                        return Err(e);
+                    }
                     let mut stmt_span = stmt.span;
                     // expand the span to include the semicolon, if it exists
                     if self.eat(&token::Semi) {