itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Do more work in inline_type_alias closure

Browse Source
This commit is contained in:
Steven Joruk 2022-03-20 20:53:03 +00:00
parent 1981a3dc65
commit 1381a2de23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ide_assists/src/handlers/inline_type_alias.rs
View File

@ -45,6 +45,11 @@ pub(crate) fn inline_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Optio
let alias = get_type_alias(&ctx, &alias_instance)?; let alias = get_type_alias(&ctx, &alias_instance)?;
let concrete_type = alias.ty()?; let concrete_type = alias.ty()?;
enum Replacement {
Generic { lifetime_map: LifetimeMap, const_and_type_map: ConstAndTypeMap },
Plain,
}
let replacement = if let Some(alias_generics) = alias.generic_param_list() { let replacement = if let Some(alias_generics) = alias.generic_param_list() {
if alias_generics.generic_params().next().is_none() { if alias_generics.generic_params().next().is_none() {
cov_mark::hit!(no_generics_params); cov_mark::hit!(no_generics_params);
@ -54,13 +59,12 @@ pub(crate) fn inline_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Optio
let instance_args = let instance_args =
alias_instance.syntax().descendants().find_map(ast::GenericArgList::cast); alias_instance.syntax().descendants().find_map(ast::GenericArgList::cast);
create_replacement( Replacement::Generic {
&LifetimeMap::new(&instance_args, &alias_generics)?, lifetime_map: LifetimeMap::new(&instance_args, &alias_generics)?,
&ConstAndTypeMap::new(&instance_args, &alias_generics)?, const_and_type_map: ConstAndTypeMap::new(&instance_args, &alias_generics)?,
&concrete_type, }
)
} else { } else {
concrete_type.to_string() Replacement::Plain
}; };
let target = alias_instance.syntax().text_range(); let target = alias_instance.syntax().text_range();
@ -70,7 +74,14 @@ pub(crate) fn inline_type_alias(acc: &mut Assists, ctx: &AssistContext) -> Optio
"Inline type alias", "Inline type alias",
target, target,
|builder| { |builder| {
builder.replace(target, replacement); let replacement_text = match replacement {
Replacement::Generic { lifetime_map, const_and_type_map } => {
create_replacement(&lifetime_map, &const_and_type_map, &concrete_type)
}
Replacement::Plain => concrete_type.to_string(),
};
builder.replace(target, replacement_text);
}, },
) )
} }