1 files changed, 67 insertions, 2 deletions

diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index fde0bfa98..63fd6b3e4 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -129,8 +129,10 @@ 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;
+    }
     let expr = extract_trivial_expression(&block_expr)?;
 
     let block_range = block_expr.syntax().text_range();
@@ -662,4 +664,67 @@ fn main() {
         ",
         )
     }
+
+    #[test]
+    fn join_lines_mandatory_blocks_block() {
+        check_join_lines(
+            r"
+<|>fn foo() {
+    92
+}
+        ",
+            r"
+<|>fn foo() { 92
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>if true {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>if true { 92
+    }
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>loop {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>loop { 92
+    }
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>unsafe {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>unsafe { 92
+    }
+}
+        ",
+        );
+    }
 }