Skip to content

Commit ce2c0c9

Browse files
authored
Merge pull request #20134 from Hmikihiro/migrate-replace_is_method_with_if_let_method-to-SyntaxFactory
Migrate `replace_is_method_with_if_let_method` Assist to use `SyntaxFactory`
2 parents eaf37e2 + fcc81a3 commit ce2c0c9

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
use ide_db::syntax_helpers::suggest_name;
2-
use syntax::{
3-
ast::{self, AstNode, make},
4-
ted,
5-
};
2+
use syntax::ast::{self, AstNode, syntax_factory::SyntaxFactory};
63

74
use crate::{AssistContext, AssistId, Assists};
85

@@ -60,21 +57,25 @@ pub(crate) fn replace_is_method_with_if_let_method(
6057
message,
6158
call_expr.syntax().text_range(),
6259
|edit| {
63-
let call_expr = edit.make_mut(call_expr);
60+
let make = SyntaxFactory::with_mappings();
61+
let mut editor = edit.make_editor(call_expr.syntax());
6462

65-
let var_pat = make::ident_pat(false, false, make::name(&var_name));
66-
let pat = make::tuple_struct_pat(make::ext::ident_path(text), [var_pat.into()]);
67-
let let_expr = make::expr_let(pat.into(), receiver).clone_for_update();
63+
let var_pat = make.ident_pat(false, false, make.name(&var_name));
64+
let pat = make.tuple_struct_pat(make.ident_path(text), [var_pat.into()]);
65+
let let_expr = make.expr_let(pat.into(), receiver);
6866

6967
if let Some(cap) = ctx.config.snippet_cap {
7068
if let Some(ast::Pat::TupleStructPat(pat)) = let_expr.pat() {
7169
if let Some(first_var) = pat.fields().next() {
72-
edit.add_placeholder_snippet(cap, first_var);
70+
let placeholder = edit.make_placeholder_snippet(cap);
71+
editor.add_annotation(first_var.syntax(), placeholder);
7372
}
7473
}
7574
}
7675

77-
ted::replace(call_expr.syntax(), let_expr.syntax());
76+
editor.replace(call_expr.syntax(), let_expr.syntax());
77+
editor.add_mappings(make.finish_with_mappings());
78+
edit.add_file_edits(ctx.vfs_file_id(), editor);
7879
},
7980
)
8081
}

0 commit comments

Comments
 (0)