always wrap block into an expression

2 files changed, 11 insertions, 11 deletions

diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index ee8797410..16824f3c4 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -97,7 +97,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
     for node in root.descendants() {
         let _ = visitor_ctx(&mut errors)
             .visit::<ast::Literal, _>(validate_literal)
-            .visit::<ast::Block, _>(block::validate_block_node)
+            .visit::<ast::BlockExpr, _>(block::validate_block_expr)
             .visit::<ast::FieldExpr, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
             .visit::<ast::RecordField, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
             .accept(&node);
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())),
+        )
+    }
 }