mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use SyntaxKind instead of "Self" literal comparison

Browse Source
This commit is contained in:
Young-Flash 2023-12-27 19:49:50 +08:00
parent 67f001e5ec
commit a38a79e2ba
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
View File

@ -250,24 +250,21 @@ fn create_struct_def(
field_list
.fields()
.filter_map(|field| match field.ty()? {
ast::Type::PathType(p) => {
let generic_arg_list = p.path()?.segment()?.generic_arg_list()?;
Some(
generic_arg_list
.generic_args()
.filter_map(|generic_arg| {
if generic_arg.to_string() == "Self" {
let type_arg =
make::type_arg(make::ty(&enum_.name()?.to_string()))
.clone_for_update();
Some(ted::replace(generic_arg.syntax(), type_arg.syntax()))
} else {
None
}
})
.count(),
)
}
ast::Type::PathType(p) => Some(
p.syntax()
.descendants_with_tokens()
.filter_map(|it| {
if it.kind() == T![Self] {
let type_arg =
make::type_arg(make::ty(&enum_.name()?.to_string()))
.clone_for_update();
Some(ted::replace(it, type_arg.syntax()))
} else {
None
}
})
.count(),
),
_ => None,
})
.count();