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

define syntax_editor_add_generic_param

Browse source 
Signed-off-by: Tarek <tareknaser360@gmail.com>
This commit is contained in:
Tarek 2024-10-30 17:56:02 +03:00
parent 4af3d6f598
commit 642d4f3385
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,13 +56,11 @@ 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))
.clone_for_update();
let new_ty = make.ty(&type_param_name).clone_for_update();
let type_param = make.type_param(make.name(&type_param_name), Some(type_bound_list));
let new_ty = make.ty(&type_param_name);
editor.replace(impl_trait_type.syntax(), new_ty.syntax());
fn_generic_param_list.add_generic_param(type_param.into());
fn_generic_param_list.syntax_editor_add_generic_param(&mut editor, type_param.into());
if let Some(cap) = ctx.config.snippet_cap {
if let Some(generic_param) =

24
crates/syntax/src/ast/edit_in_place.rs
View file

@ -7,6 +7,7 @@ use parser::{SyntaxKind, T};
use crate::{
algo::{self, neighbor},
ast::{self, edit::IndentLevel, make, HasGenericArgs, HasGenericParams},
syntax_editor::SyntaxEditor,
ted::{self, Position},
AstNode, AstToken, Direction, SyntaxElement,
SyntaxKind::{ATTR, COMMENT, WHITESPACE},
@ -257,6 +258,29 @@ impl ast::GenericParamList {
}
}
pub fn syntax_editor_add_generic_param(
&self,
editor: &mut SyntaxEditor,
generic_param: ast::GenericParam,
) {
match self.generic_params().last() {
Some(last_param) => {
let position = crate::syntax_editor::Position::after(last_param.syntax());
let elements = vec![
make::token(T![,]).into(),
make::tokens::single_space().into(),
generic_param.syntax().clone().into(),
];
editor.insert_all(position, elements);
}
None => {
let after_l_angle =
crate::syntax_editor::Position::after(self.l_angle_token().unwrap());
editor.insert(after_l_angle, generic_param.syntax());
}
}
}
/// Removes the existing generic param
pub fn remove_generic_param(&self, generic_param: ast::GenericParam) {
if let Some(previous) = generic_param.syntax().prev_sibling() {

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

@ -2,7 +2,7 @@
use itertools::Itertools;
use crate::{
ast::{self, make, HasName},
ast::{self, make, HasName, HasTypeBounds},
syntax_editor::SyntaxMappingBuilder,
AstNode,
};
@ -15,7 +15,6 @@ impl SyntaxFactory {
}
pub fn ty(&self, text: &str) -> ast::Type {
// FIXME: Is there anything to map here?
make::ty(text).clone_for_update()
}
@ -29,6 +28,12 @@ impl SyntaxFactory {
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());
if let Some(input) = bounds {
builder.map_node(
input.syntax().clone(),
ast.type_bound_list().unwrap().syntax().clone(),
);
}
builder.finish(&mut mapping);
}