Merge #925

925: improve error recovery r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 6 insertions, 2 deletions

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() {