rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-assists/src/handlers/unwrap_block.rs')

-rw-r--r--

1 files changed, 1 insertions, 3 deletions

diff --git a/crates/ide-assists/src/handlers/unwrap_block.rs b/crates/ide-assists/src/handlers/unwrap_block.rs
index e029d7884f..5593ca3eb8 100644
--- a/crates/ide-assists/src/handlers/unwrap_block.rs
+++ b/crates/ide-assists/src/handlers/unwrap_block.rs

@@ -103,8 +103,7 @@ fn delete_else_before(container: SyntaxNode, edit: &mut SyntaxEditor) {

fn wrap_let(assign: &ast::LetStmt, replacement: ast::BlockExpr) -> ast::BlockExpr {

let try_wrap_assign = || {

let initializer = assign.initializer()?.syntax().syntax_element();

- let replacement = replacement.clone_subtree();

- let assign = assign.clone_for_update();

+ let (mut edit, replacement) = SyntaxEditor::with_ast_node(&replacement);

let tail_expr = replacement.tail_expr()?;

let before =

assign.syntax().children_with_tokens().take_while(|it| *it != initializer).collect();

@@ -115,7 +114,6 @@ fn wrap_let(assign: &ast::LetStmt, replacement: ast::BlockExpr) -> ast::BlockExp

.skip(1)

.collect();

- let mut edit = SyntaxEditor::new(replacement.syntax().clone());

edit.insert_all(Position::before(tail_expr.syntax()), before);

edit.insert_all(Position::after(tail_expr.syntax()), after);

ast::BlockExpr::cast(edit.finish().new_root().clone())