diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-02 10:57:45 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-02 10:57:45 +0100 |
| commit | 75bc0249463b72971200e482d69dad88d4e76ae3 (patch) | |
| tree | cf12a19a548f77af306bd8eeb4ba6a74175e1790 /crates/ra_ide/src/join_lines.rs | |
| parent | 235728319fb545670e49db996e9c2cd94b8b34eb (diff) | |
| parent | b73dbbfbf2cad646eb3f8e3342a1c390a874dc53 (diff) | |
Merge #4257
4257: ast::EffectExpr r=matklad a=matklad
closes #4230
Co-authored-by: Aleksey Kladov <[email protected]>
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 | } |