Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: migrate introduce_named_generic assist to use SyntaxFactory

Browse source 
Signed-off-by: Tarek <tareknaser360@gmail.com>
This commit is contained in:
Tarek 2024-10-28 20:09:52 +03:00
parent 26bc01dae3
commit 1400aec433
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/ide-assists/src/handlers/introduce_named_generic.rs
View file

@ -1,8 +1,11 @@
use ide_db::syntax_helpers::suggest_name;
use itertools::Itertools;
use syntax::{
ast::{self, edit_in_place::GenericParamsOwnerEdit, make, AstNode, HasGenericParams, HasName},
ted,
ast::{
self, edit_in_place::GenericParamsOwnerEdit, syntax_factory::SyntaxFactory, AstNode,
HasGenericParams, HasName,
},
SyntaxElement,
};
use crate::{AssistContext, AssistId, AssistKind, Assists};
@ -25,12 +28,20 @@ pub(crate) fn introduce_named_generic(acc: &mut Assists, ctx: &AssistContext<'_>
let type_bound_list = impl_trait_type.type_bound_list()?;
// FIXME: Is this node appropriate to use for SyntaxEditor in this case?
let parent_node = match ctx.covering_element() {
SyntaxElement::Node(n) => n,
SyntaxElement::Token(t) => t.parent()?,
};
let make = SyntaxFactory::new();
let target = fn_.syntax().text_range();
acc.add(
AssistId("introduce_named_generic", AssistKind::RefactorRewrite),
"Replace impl trait with generic",
target,
|edit| {
let mut editor = edit.make_editor(&parent_node);
let impl_trait_type = edit.make_mut(impl_trait_type);
let fn_ = edit.make_mut(fn_);
let fn_generic_param_list = fn_.get_or_create_generic_param_list();
@ -47,11 +58,12 @@ pub(crate) fn introduce_named_generic(acc: &mut Assists, ctx: &AssistContext<'_>
)
.for_impl_trait_as_generic(&impl_trait_type);
let type_param = make::type_param(make::name(&type_param_name), Some(type_bound_list))
let type_param = make
.type_param(make.name(&type_param_name), Some(type_bound_list))
.clone_for_update();
let new_ty = make::ty(&type_param_name).clone_for_update();
let new_ty = make.ty(&type_param_name).clone_for_update();
ted::replace(impl_trait_type.syntax(), new_ty.syntax());
editor.replace(impl_trait_type.syntax(), new_ty.syntax());
fn_generic_param_list.add_generic_param(type_param.into());
if let Some(cap) = ctx.config.snippet_cap {
@ -61,6 +73,9 @@ pub(crate) fn introduce_named_generic(acc: &mut Assists, ctx: &AssistContext<'_>
edit.add_tabstop_before(cap, generic_param);
}
}
editor.add_mappings(make.finish_with_mappings());
edit.add_file_edits(ctx.file_id(), editor);
},
)
}

21
crates/syntax/src/ast/syntax_factory/constructors.rs
View file

@ -14,6 +14,27 @@ impl SyntaxFactory {
make::name(name).clone_for_update()
}
pub fn ty(&self, text: &str) -> ast::Type {
// FIXME: Is there anything to map here?
make::ty(text).clone_for_update()
}
pub fn type_param(
&self,
name: ast::Name,
bounds: Option<ast::TypeBoundList>,
) -> ast::TypeParam {
let ast = make::type_param(name.clone(), bounds.clone()).clone_for_update();
if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
builder.map_node(name.syntax().clone(), ast.name().unwrap().syntax().clone());
builder.finish(&mut mapping);
}
ast
}
pub fn ident_pat(&self, ref_: bool, mut_: bool, name: ast::Name) -> ast::IdentPat {
let ast = make::ident_pat(ref_, mut_, name.clone()).clone_for_update();