Merge #4261

4261: Fix parsing of blocks without `{` r=matklad a=matklad



bors r+
🤖

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

5 files changed, 78 insertions, 25 deletions

diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index 06a326d26..3bf57eacc 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -40,5 +40,5 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-error 24..24: expected `{`
+error 24..24: expected a block
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
new file mode 100644
index 000000000..e46456384
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -0,0 +1,71 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "main"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "try"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "{"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "\'label"
+              [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] " "
+        [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
+error 24..24: expected existential, fn, trait or impl
+error 41..41: expected existential, fn, trait or impl
+error 56..56: expected a block
+error 75..75: expected a loop
+error 75..75: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
new file mode 100644
index 000000000..8fa324c1a
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
@@ -0,0 +1,6 @@
+fn main() {
+    { unsafe 92 }
+    { async 92 }
+    { try 92 }
+    { 'label: 92 }
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
deleted file mode 100644
index f3a5e3096..000000000
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ /dev/null
@@ -1,21 +0,0 @@
-[email protected]
-  [email protected]
-    [email protected] "fn"
-    [email protected] " "
-    [email protected]
-      [email protected] "foo"
-    [email protected]
-      [email protected] "("
-      [email protected] ")"
-    [email protected] " "
-    [email protected]
-      [email protected] "{"
-      [email protected] "\n    "
-      [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "}"
-        [email protected] ";"
-      [email protected] "\n"
-      [email protected] "}"
-  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
deleted file mode 100644
index 9c6019fb1..000000000
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn foo() {
-    {};
-}