Skip to content

Commit c82beb3

Browse files
committed
Replace make with SyntaxFactory in unwrap_block
1 parent 2ecc15e commit c82beb3

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

crates/ide-assists/src/handlers/unwrap_block.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use syntax::{
33
ast::{
44
self,
55
edit::{AstNodeEdit, IndentLevel},
6-
make,
76
},
87
match_ast,
98
syntax_editor::{Element, Position, SyntaxEditor},
@@ -83,7 +82,8 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option
8382
})
8483
}
8584

86-
fn delete_else_before(container: SyntaxNode, edit: &SyntaxEditor) {
85+
fn delete_else_before(container: SyntaxNode, editor: &SyntaxEditor) {
86+
let make = editor.make();
8787
let Some(else_token) = container
8888
.siblings_with_tokens(syntax::Direction::Prev)
8989
.skip(1)
@@ -94,10 +94,10 @@ fn delete_else_before(container: SyntaxNode, edit: &SyntaxEditor) {
9494
};
9595
itertools::chain(else_token.prev_token(), else_token.next_token())
9696
.filter(|it| it.kind() == SyntaxKind::WHITESPACE)
97-
.for_each(|it| edit.delete(it));
97+
.for_each(|it| editor.delete(it));
9898
let indent = IndentLevel::from_node(&container);
99-
let newline = make::tokens::whitespace(&format!("\n{indent}"));
100-
edit.replace(else_token, newline);
99+
let newline = make.whitespace(&format!("\n{indent}"));
100+
editor.replace(else_token, newline);
101101
}
102102

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

0 commit comments

Comments
 (0)