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, 10 insertions, 10 deletions

diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index c5588658d..3c9e96eb3 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -5,18 +5,18 @@ use crate::{
     SyntaxKind::*,
 };
 
-pub(crate) fn validate_block_node(node: ast::Block, errors: &mut Vec<SyntaxError>) {
-    if let Some(parent) = node.syntax().parent() {
+pub(crate) fn validate_block_expr(expr: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
+    if let Some(parent) = expr.syntax().parent() {
         match parent.kind() {
-            FN_DEF => return,
-            BLOCK_EXPR => match parent.parent().map(|v| v.kind()) {
-                Some(EXPR_STMT) | Some(BLOCK) => return,
-                _ => {}
-            },
+            FN_DEF | EXPR_STMT | BLOCK => return,
             _ => {}
         }
     }
-    errors.extend(
-        node.attrs().map(|attr| SyntaxError::new(InvalidBlockAttr, attr.syntax().text_range())),
-    )
+    if let Some(block) = expr.block() {
+        errors.extend(
+            block
+                .attrs()
+                .map(|attr| SyntaxError::new(InvalidBlockAttr, attr.syntax().text_range())),
+        )
+    }
 }