language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 02:52:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #20383 from Hmikihiro/remove_ted_from_replace_named_generic_with_impl

Browse source 
remove `ted` from replace_named_generic_with_impl.rs
This commit is contained in:
Shoyu Vanilla (Flint) 2025-08-05 09:43:32 +00:00 • committed by GitHub
commit 6600a1a18b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/ide-assists/src/handlers/replace_named_generic_with_impl.rs
View file

@ -7,11 +7,8 @@ use ide_db::{
}; };
use syntax::{ use syntax::{
AstNode, AstNode,
ast::{ ast::{self, HasGenericParams, HasName, HasTypeBounds, Name, NameLike, PathType, make},
self, HasGenericParams, HasName, HasTypeBounds, Name, NameLike, PathType, match_ast,
make::impl_trait_type,
},
match_ast, ted,
}; };
use crate::{AssistContext, AssistId, Assists}; use crate::{AssistContext, AssistId, Assists};
@ -74,26 +71,31 @@ pub(crate) fn replace_named_generic_with_impl(
"Replace named generic with impl trait", "Replace named generic with impl trait",
target, target,
|edit| { |edit| {
let type_param = edit.make_mut(type_param); let mut editor = edit.make_editor(type_param.syntax());
let fn_ = edit.make_mut(fn_);
let path_types_to_replace = path_types_to_replace
.into_iter()
.map(|param| edit.make_mut(param))
.collect::<Vec<_>>();
// remove trait from generic param list // remove trait from generic param list
if let Some(generic_params) = fn_.generic_param_list() { if let Some(generic_params) = fn_.generic_param_list() {
generic_params.remove_generic_param(ast::GenericParam::TypeParam(type_param)); let params: Vec<ast::GenericParam> = generic_params
if generic_params.generic_params().count() == 0 { .clone()
ted::remove(generic_params.syntax()); .generic_params()
.filter(|it| it.syntax() != type_param.syntax())
.collect();
if params.is_empty() {
editor.delete(generic_params.syntax());
} else {
let new_generic_param_list = make::generic_param_list(params);
editor.replace(
generic_params.syntax(),
new_generic_param_list.syntax().clone_for_update(),
);
} }
} }
let new_bounds = impl_trait_type(type_bound_list); let new_bounds = make::impl_trait_type(type_bound_list);
for path_type in path_types_to_replace.iter().rev() { for path_type in path_types_to_replace.iter().rev() {
ted::replace(path_type.syntax(), new_bounds.clone_for_update().syntax()); editor.replace(path_type.syntax(), new_bounds.clone_for_update().syntax());
} }
edit.add_file_edits(ctx.vfs_file_id(), editor);
}, },
) )
} }