itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20218 from Hmikihiro/migrate_convert_match_to_let_else

Browse Source 
Migrate `convert_match_to_let_else` assist to use `SyntaxEditor`
This commit is contained in:
Shoyu Vanilla (Flint) 2025-07-10 04:32:40 +00:00 committed by GitHub
commit df1c3e03df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/ide-assists/src/handlers/convert_match_to_let_else.rs
View File

@ -1,8 +1,8 @@
use ide_db::defs::{Definition, NameRefClass}; use ide_db::defs::{Definition, NameRefClass};
use syntax::{ use syntax::{
AstNode, SyntaxNode, AstNode, SyntaxNode,
ast::{self, HasName, Name}, ast::{self, HasName, Name, syntax_factory::SyntaxFactory},
ted, syntax_editor::SyntaxEditor,
}; };
use crate::{ use crate::{
@ -121,34 +121,36 @@ fn find_extracted_variable(ctx: &AssistContext<'_>, arm: &ast::MatchArm) -> Opti
// Rename `extracted` with `binding` in `pat`. // Rename `extracted` with `binding` in `pat`.
fn rename_variable(pat: &ast::Pat, extracted: &[Name], binding: ast::Pat) -> SyntaxNode { fn rename_variable(pat: &ast::Pat, extracted: &[Name], binding: ast::Pat) -> SyntaxNode {
let syntax = pat.syntax().clone_for_update(); let syntax = pat.syntax().clone_subtree();
let mut editor = SyntaxEditor::new(syntax.clone());
let make = SyntaxFactory::with_mappings();
let extracted = extracted let extracted = extracted
.iter() .iter()
.map(|e| syntax.covering_element(e.syntax().text_range())) .map(|e| e.syntax().text_range() - pat.syntax().text_range().start())
.map(|r| syntax.covering_element(r))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
for extracted_syntax in extracted { for extracted_syntax in extracted {
// If `extracted` variable is a record field, we should rename it to `binding`, // If `extracted` variable is a record field, we should rename it to `binding`,
// otherwise we just need to replace `extracted` with `binding`. // otherwise we just need to replace `extracted` with `binding`.
if let Some(record_pat_field) = if let Some(record_pat_field) =
extracted_syntax.ancestors().find_map(ast::RecordPatField::cast) extracted_syntax.ancestors().find_map(ast::RecordPatField::cast)
{ {
if let Some(name_ref) = record_pat_field.field_name() { if let Some(name_ref) = record_pat_field.field_name() {
ted::replace( editor.replace(
record_pat_field.syntax(), record_pat_field.syntax(),
ast::make::record_pat_field( make.record_pat_field(
ast::make::name_ref(&name_ref.text()), make.name_ref(&name_ref.text()),
binding.clone(), binding.clone_for_update(),
) )
.syntax() .syntax(),
.clone_for_update(),
); );
} }
} else { } else {
ted::replace(extracted_syntax, binding.clone().syntax().clone_for_update()); editor.replace(extracted_syntax, binding.syntax().clone_for_update());
} }
} }
syntax editor.add_mappings(make.finish_with_mappings());
editor.finish().new_root().clone()
} }
#[cfg(test)] #[cfg(test)]