diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-02 11:25:04 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-02 11:25:04 +0100 |
| commit | 0b40876b993ab30421624b831cb03b4042eb0142 (patch) | |
| tree | 85abb233dd8645480d61ab857a2b46c1209b142a /crates/ra_ide/src/join_lines.rs | |
| parent | eea21738ab9e0b7438d03f7b2efc18c15cc30cf2 (diff) | |
| parent | 75bc0249463b72971200e482d69dad88d4e76ae3 (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_ide/src/join_lines.rs')
| -rw-r--r-- | crates/ra_ide/src/join_lines.rs | 3 |
1 files changed, 1 insertions, 2 deletions
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 { | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> { | 131 | fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> { |
| 132 | let block = ast::Block::cast(token.parent())?; | 132 | let block_expr = ast::BlockExpr::cast(token.parent())?; |
| 133 | let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?; | ||
| 134 | if !block_expr.is_standalone() { | 133 | if !block_expr.is_standalone() { |
| 135 | return None; | 134 | return None; |
| 136 | } | 135 | } |