Merge #1752

1752: Always wrap blocks into block expressions r=flodiebold a=matklad

This way, things like function bodies are expressions, and we don't have to single them out

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

1 files changed, 25 insertions, 23 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt
index 09e108570..83c58d25f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt
@@ -8,27 +8,29 @@ SOURCE_FILE@[0; 33)
       L_PAREN@[6; 7) "("
       R_PAREN@[7; 8) ")"
     WHITESPACE@[8; 9) " "
-    BLOCK@[9; 32)
-      L_CURLY@[9; 10) "{"
-      WHITESPACE@[10; 15) "\n    "
-      EXPR_STMT@[15; 30)
-        FOR_EXPR@[15; 29)
-          FOR_KW@[15; 18) "for"
-          WHITESPACE@[18; 19) " "
-          BIND_PAT@[19; 20)
-            NAME@[19; 20)
-              IDENT@[19; 20) "x"
-          WHITESPACE@[20; 21) " "
-          IN_KW@[21; 23) "in"
-          WHITESPACE@[23; 24) " "
-          ARRAY_EXPR@[24; 26)
-            L_BRACK@[24; 25) "["
-            R_BRACK@[25; 26) "]"
-          WHITESPACE@[26; 27) " "
-          BLOCK@[27; 29)
-            L_CURLY@[27; 28) "{"
-            R_CURLY@[28; 29) "}"
-        SEMI@[29; 30) ";"
-      WHITESPACE@[30; 31) "\n"
-      R_CURLY@[31; 32) "}"
+    BLOCK_EXPR@[9; 32)
+      BLOCK@[9; 32)
+        L_CURLY@[9; 10) "{"
+        WHITESPACE@[10; 15) "\n    "
+        EXPR_STMT@[15; 30)
+          FOR_EXPR@[15; 29)
+            FOR_KW@[15; 18) "for"
+            WHITESPACE@[18; 19) " "
+            BIND_PAT@[19; 20)
+              NAME@[19; 20)
+                IDENT@[19; 20) "x"
+            WHITESPACE@[20; 21) " "
+            IN_KW@[21; 23) "in"
+            WHITESPACE@[23; 24) " "
+            ARRAY_EXPR@[24; 26)
+              L_BRACK@[24; 25) "["
+              R_BRACK@[25; 26) "]"
+            WHITESPACE@[26; 27) " "
+            BLOCK_EXPR@[27; 29)
+              BLOCK@[27; 29)
+                L_CURLY@[27; 28) "{"
+                R_CURLY@[28; 29) "}"
+          SEMI@[29; 30) ";"
+        WHITESPACE@[30; 31) "\n"
+        R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"