Skip to content

Migrate replace_is_method_with_if_let_method Assist to use SyntaxFactory #20134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged

Migrate replace_is_method_with_if_let_method Assist to use SyntaxFactory #20134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a247d
Migrate `replace_is_method_with_if_let_method` Assist to use `SyntaxF…
Hmikihiro Jul 1, 2025
fcc81a3
remove `if-let` chains
Hmikihiro Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use ide_db::syntax_helpers::suggest_name;
use syntax::{
ast::{self, AstNode, make},
ted,
};
use syntax::ast::{self, AstNode, syntax_factory::SyntaxFactory};

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

Expand Down Expand Up @@ -60,21 +57,25 @@ pub(crate) fn replace_is_method_with_if_let_method(
message,
call_expr.syntax().text_range(),
|edit| {
let call_expr = edit.make_mut(call_expr);
let make = SyntaxFactory::with_mappings();
let mut editor = edit.make_editor(call_expr.syntax());

let var_pat = make::ident_pat(false, false, make::name(&var_name));
let pat = make::tuple_struct_pat(make::ext::ident_path(text), [var_pat.into()]);
let let_expr = make::expr_let(pat.into(), receiver).clone_for_update();
let var_pat = make.ident_pat(false, false, make.name(&var_name));
let pat = make.tuple_struct_pat(make.ident_path(text), [var_pat.into()]);
let let_expr = make.expr_let(pat.into(), receiver);

if let Some(cap) = ctx.config.snippet_cap {
if let Some(ast::Pat::TupleStructPat(pat)) = let_expr.pat() {
if let Some(first_var) = pat.fields().next() {
edit.add_placeholder_snippet(cap, first_var);
let placeholder = edit.make_placeholder_snippet(cap);
editor.add_annotation(first_var.syntax(), placeholder);
}
}
}

ted::replace(call_expr.syntax(), let_expr.syntax());
editor.replace(call_expr.syntax(), let_expr.syntax());
editor.add_mappings(make.finish_with_mappings());
edit.add_file_edits(ctx.vfs_file_id(), editor);
},
)
}
Expand Down