From 4f2134cc33f07c09fe166cec42971828843bc0ef Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 2 May 2020 01:18:19 +0200
Subject: Introduce EffectExpr

---
 crates/ra_ide/src/syntax_tree.rs | 77 ++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

(limited to 'crates/ra_ide/src/syntax_tree.rs')

diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index bf97f8c56..86c70ff83 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -120,9 +120,8 @@ SOURCE_FILE@0..11
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..11
-      BLOCK@9..11
-        L_CURLY@9..10 "{"
-        R_CURLY@10..11 "}"
+      L_CURLY@9..10 "{"
+      R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -153,26 +152,25 @@ SOURCE_FILE@0..60
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..60
-      BLOCK@10..60
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        EXPR_STMT@16..58
-          MACRO_CALL@16..57
-            PATH@16..22
-              PATH_SEGMENT@16..22
-                NAME_REF@16..22
-                  IDENT@16..22 "assert"
-            BANG@22..23 "!"
-            TOKEN_TREE@23..57
-              L_PAREN@23..24 "("
-              STRING@24..52 "\"\n    fn foo() {\n     ..."
-              COMMA@52..53 ","
-              WHITESPACE@53..54 " "
-              STRING@54..56 "\"\""
-              R_PAREN@56..57 ")"
-          SEMICOLON@57..58 ";"
-        WHITESPACE@58..59 "\n"
-        R_CURLY@59..60 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      EXPR_STMT@16..58
+        MACRO_CALL@16..57
+          PATH@16..22
+            PATH_SEGMENT@16..22
+              NAME_REF@16..22
+                IDENT@16..22 "assert"
+          BANG@22..23 "!"
+          TOKEN_TREE@23..57
+            L_PAREN@23..24 "("
+            STRING@24..52 "\"\n    fn foo() {\n     ..."
+            COMMA@52..53 ","
+            WHITESPACE@53..54 " "
+            STRING@54..56 "\"\""
+            R_PAREN@56..57 ")"
+        SEMICOLON@57..58 ";"
+      WHITESPACE@58..59 "\n"
+      R_CURLY@59..60 "}"
 "#
             .trim()
         );
@@ -196,9 +194,8 @@ FN_DEF@0..11
     R_PAREN@7..8 ")"
   WHITESPACE@8..9 " "
   BLOCK_EXPR@9..11
-    BLOCK@9..11
-      L_CURLY@9..10 "{"
-      R_CURLY@10..11 "}"
+    L_CURLY@9..10 "{"
+    R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -265,10 +262,9 @@ SOURCE_FILE@0..12
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -300,10 +296,9 @@ SOURCE_FILE@0..12
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -334,10 +329,9 @@ SOURCE_FILE@0..25
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
   WHITESPACE@12..13 "\n"
   FN_DEF@13..25
     FN_KW@13..15 "fn"
@@ -349,10 +343,9 @@ SOURCE_FILE@0..25
       R_PAREN@20..21 ")"
     WHITESPACE@21..22 " "
     BLOCK_EXPR@22..25
-      BLOCK@22..25
-        L_CURLY@22..23 "{"
-        WHITESPACE@23..24 "\n"
-        R_CURLY@24..25 "}"
+      L_CURLY@22..23 "{"
+      WHITESPACE@23..24 "\n"
+      R_CURLY@24..25 "}"
 "#
             .trim()
         );
-- 
cgit v1.2.3