user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18538 from tareknaser/syntax_factory_sort_items

Browse source 
Migrate `sort_items` Assist to Use `SyntaxFactory`
This commit is contained in:
David Barsky 2024-12-05 19:21:51 +00:00 • committed by GitHub
commit 23339cb44c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/tools/rust-analyzer/crates/ide-assists/src/handlers/sort_items.rs
View file

@ -4,7 +4,7 @@ use itertools::Itertools;
use syntax::{
ast::{self, HasName},
ted, AstNode, TextRange,
AstNode, SyntaxNode,
};
use crate::{utils::get_methods, AssistContext, AssistId, AssistKind, Assists};
@ -114,7 +114,7 @@ trait AddRewrite {
label: &str,
old: Vec<T>,
new: Vec<T>,
target: TextRange,
target: &SyntaxNode,
) -> Option<()>;
}
@ -124,15 +124,23 @@ impl AddRewrite for Assists {
label: &str,
old: Vec<T>,
new: Vec<T>,
target: TextRange,
target: &SyntaxNode,
) -> Option<()> {
self.add(AssistId("sort_items", AssistKind::RefactorRewrite), label, target, |builder| {
let mutable: Vec<T> = old.into_iter().map(|it| builder.make_mut(it)).collect();
mutable
.into_iter()
.zip(new)
.for_each(|(old, new)| ted::replace(old.syntax(), new.clone_for_update().syntax()));
})
self.add(
AssistId("sort_items", AssistKind::RefactorRewrite),
label,
target.text_range(),
|builder| {
let mut editor = builder.make_editor(target);
old.into_iter().zip(new).for_each(|(old, new)| {
// FIXME: remove `clone_for_update` when `SyntaxEditor` handles it for us
editor.replace(old.syntax(), new.clone_for_update().syntax())
});
builder.add_file_edits(builder.file_id, editor)
},
)
}
}
@ -167,7 +175,7 @@ fn add_sort_methods_assist(
return None;
}
acc.add_rewrite("Sort methods alphabetically", methods, sorted, item_list.syntax().text_range())
acc.add_rewrite("Sort methods alphabetically", methods, sorted, item_list.syntax())
}
fn add_sort_fields_assist(
@ -182,12 +190,7 @@ fn add_sort_fields_assist(
return None;
}
acc.add_rewrite(
"Sort fields alphabetically",
fields,
sorted,
record_field_list.syntax().text_range(),
)
acc.add_rewrite("Sort fields alphabetically", fields, sorted, record_field_list.syntax())
}
fn add_sort_variants_assist(acc: &mut Assists, variant_list: ast::VariantList) -> Option<()> {
@ -199,12 +202,7 @@ fn add_sort_variants_assist(acc: &mut Assists, variant_list: ast::VariantList) -
return None;
}
acc.add_rewrite(
"Sort variants alphabetically",
variants,
sorted,
variant_list.syntax().text_range(),
)
acc.add_rewrite("Sort variants alphabetically", variants, sorted, variant_list.syntax())
}
fn sort_by_name<T: HasName + Clone>(initial: &[T]) -> Vec<T> {