2 files changed, 13 insertions, 19 deletions

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 15aab6c6f..f94702e97 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -182,21 +182,11 @@ fn name_ref(p: &mut Parser) {
 }
 
 fn error_block(p: &mut Parser, message: &str) {
-    go(p, Some(message));
-    fn go(p: &mut Parser, message: Option<&str>) {
-        assert!(p.at(L_CURLY));
-        let m = p.start();
-        if let Some(message) = message {
-            p.error(message);
-        }
-        p.bump();
-        while !p.at(EOF) && !p.at(R_CURLY) {
-            match p.current() {
-                L_CURLY => go(p, None),
-                _ => p.bump(),
-            }
-        }
-        p.eat(R_CURLY);
-        m.complete(p, ERROR);
-    }
+    assert!(p.at(L_CURLY));
+    let m = p.start();
+    p.error(message);
+    p.bump();
+    expressions::expr_block_contents(p);
+    p.eat(R_CURLY);
+    m.complete(p, ERROR);
 }
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index d5a4f4d7b..70c71a8e1 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -33,6 +33,12 @@ pub(crate) fn block(p: &mut Parser) {
     }
     let m = p.start();
     p.bump();
+    expr_block_contents(p);
+    p.expect(R_CURLY);
+    m.complete(p, BLOCK);
+}
+
+pub(crate) fn expr_block_contents(p: &mut Parser) {
     // This is checked by a validator
     attributes::inner_attributes(p);
 
@@ -101,8 +107,6 @@ pub(crate) fn block(p: &mut Parser) {
             }
         }
     }
-    p.expect(R_CURLY);
-    m.complete(p, BLOCK);
 
     // test let_stmt;
     // fn foo() {