Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add GenericParamList::to_generic_args

Browse source
This commit is contained in:
DropDemBits 2022-10-09 17:58:55 -04:00
parent 8437e4ba58
commit 75f641799e
2 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
View file

@ -9,7 +9,7 @@ use ide_db::{
search::FileReference,
FxHashSet, RootDatabase,
};
use itertools::{Itertools, Position};
use itertools::Itertools;
use syntax::{
ast::{
self, edit::IndentLevel, edit_in_place::Indent, make, AstNode, HasAttrs, HasGenericParams,
@ -298,37 +298,7 @@ fn update_variant(variant: &ast::Variant, generics: Option<ast::GenericParamList
let name = variant.name()?;
let ty = generics
.filter(|generics| generics.generic_params().count() > 0)
.map(|generics| {
let mut generic_str = String::with_capacity(8);
for (p, more) in generics.generic_params().with_position().map(|p| match p {
Position::First(p) | Position::Middle(p) => (p, true),
Position::Last(p) | Position::Only(p) => (p, false),
}) {
match p {
ast::GenericParam::ConstParam(konst) => {
if let Some(name) = konst.name() {
generic_str.push_str(name.text().as_str());
}
}
ast::GenericParam::LifetimeParam(lt) => {
if let Some(lt) = lt.lifetime() {
generic_str.push_str(lt.text().as_str());
}
}
ast::GenericParam::TypeParam(ty) => {
if let Some(name) = ty.name() {
generic_str.push_str(name.text().as_str());
}
}
}
if more {
generic_str.push_str(", ");
}
}
make::ty(&format!("{}<{}>", &name.text(), &generic_str))
})
.map(|generics| make::ty(&format!("{}{}", &name.text(), generics.to_generic_args())))
.unwrap_or_else(|| make::ty(&name.text()));
// change from a record to a tuple field list

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

@ -235,6 +235,23 @@ impl ast::GenericParamList {
}
}
}
/// Extracts the const, type, and lifetime names into a new [`ast::GenericParamList`]
pub fn to_generic_args(&self) -> ast::GenericParamList {
let params = self.generic_params().filter_map(|param| match param {
ast::GenericParam::ConstParam(it) => {
Some(ast::GenericParam::TypeParam(make::type_param(it.name()?, None)))
}
ast::GenericParam::LifetimeParam(it) => {
Some(ast::GenericParam::LifetimeParam(make::lifetime_param(it.lifetime()?)))
}
ast::GenericParam::TypeParam(it) => {
Some(ast::GenericParam::TypeParam(make::type_param(it.name()?, None)))
}
});
make::generic_param_list(params)
}
}
impl ast::WhereClause {