Merge #4257

4257: ast::EffectExpr r=matklad a=matklad

closes #4230 

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

4 files changed, 38 insertions, 46 deletions

diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 118fceb2e..c529752d4 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -344,7 +344,7 @@ impl<'a> CompletionContext<'a> {
                                 stmt.syntax().text_range() == name_ref.syntax().text_range(),
                             );
                         }
-                        if let Some(block) = ast::Block::cast(node) {
+                        if let Some(block) = ast::BlockExpr::cast(node) {
                             return Some(
                                 block.expr().map(|e| e.syntax().text_range())
                                     == Some(name_ref.syntax().text_range()),
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 4379005aa..8657377de 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -88,7 +88,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         | ITEM_LIST
         | EXTERN_ITEM_LIST
         | USE_TREE_LIST
-        | BLOCK
+        | BLOCK_EXPR
         | MATCH_ARM_LIST
         | ENUM_VARIANT_LIST
         | TOKEN_TREE => Some(FoldKind::Block),
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index d0def7eaa..63fd6b3e4 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -129,8 +129,7 @@ fn has_comma_after(node: &SyntaxNode) -> bool {
 }
 
 fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
-    let block = ast::Block::cast(token.parent())?;
-    let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
+    let block_expr = ast::BlockExpr::cast(token.parent())?;
     if !block_expr.is_standalone() {
         return None;
     }
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 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -153,26 +152,25 @@ [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] "assert"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"\n    fn foo() {\n     ..."
-              [email protected] ","
-              [email protected] " "
-              [email protected] "\"\""
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"\n    fn foo() {\n     ..."
+            [email protected] ","
+            [email protected] " "
+            [email protected] "\"\""
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -196,9 +194,8 @@ [email protected]
     [email protected] ")"
   [email protected] " "
   [email protected]
-    [email protected]
-      [email protected] "{"
-      [email protected] "}"
+    [email protected] "{"
+    [email protected] "}"
 "#
             .trim()
         );
@@ -265,10 +262,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -300,10 +296,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -334,10 +329,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -349,10 +343,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );