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

Sort methods in generate_delegate_methods listing

Browse Source
This commit is contained in:
Lukas Wirth 2023-06-16 18:41:25 +02:00
parent 3484b5a116
commit bd093d1ccd
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ide-assists/src/handlers/generate_delegate_methods.rs
View File

@ -72,29 +72,27 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
let krate = ty.krate(ctx.db()); let krate = ty.krate(ctx.db());
ty.iterate_assoc_items(ctx.db(), krate, |item| { ty.iterate_assoc_items(ctx.db(), krate, |item| {
if let hir::AssocItem::Function(f) = item { if let hir::AssocItem::Function(f) = item {
let name = f.name(ctx.db());
if f.self_param(ctx.db()).is_some() if f.self_param(ctx.db()).is_some()
&& f.is_visible_from(ctx.db(), current_module) && f.is_visible_from(ctx.db(), current_module)
&& seen_names.insert(f.name(ctx.db())) && seen_names.insert(name.clone())
{ {
methods.push(f) methods.push((name, f))
} }
} }
Option::<()>::None Option::<()>::None
}); });
} }
methods.sort_by(|(a, _), (b, _)| a.cmp(b));
for method in methods { for (name, method) in methods {
let adt = ast::Adt::Struct(strukt.clone()); let adt = ast::Adt::Struct(strukt.clone());
let name = method.name(ctx.db()).display(ctx.db()).to_string(); let name = name.display(ctx.db()).to_string();
// if `find_struct_impl` returns None, that means that a function named `name` already exists. // if `find_struct_impl` returns None, that means that a function named `name` already exists.
let Some(impl_def) = find_struct_impl(ctx, &adt, &[name]) else { continue; }; let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else { continue; };
acc.add_group( acc.add_group(
&GroupLabel("Generate delegate methods…".to_owned()), &GroupLabel("Generate delegate methods…".to_owned()),
AssistId("generate_delegate_methods", AssistKind::Generate), AssistId("generate_delegate_methods", AssistKind::Generate),
format!( format!("Generate delegate for `{field_name}.{name}()`",),
"Generate delegate for `{field_name}.{}()`",
method.name(ctx.db()).display(ctx.db())
),
target, target,
|builder| { |builder| {
// Create the function // Create the function
@ -102,9 +100,8 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
Some(source) => source.value, Some(source) => source.value,
None => return, None => return,
}; };
let method_name = method.name(ctx.db());
let vis = method_source.visibility(); let vis = method_source.visibility();
let name = make::name(&method.name(ctx.db()).display(ctx.db()).to_string()); let fn_name = make::name(&name);
let params = let params =
method_source.param_list().unwrap_or_else(|| make::param_list(None, [])); method_source.param_list().unwrap_or_else(|| make::param_list(None, []));
let type_params = method_source.generic_param_list(); let type_params = method_source.generic_param_list();
@ -114,7 +111,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
}; };
let tail_expr = make::expr_method_call( let tail_expr = make::expr_method_call(
make::ext::field_from_idents(["self", &field_name]).unwrap(), // This unwrap is ok because we have at least 1 arg in the list make::ext::field_from_idents(["self", &field_name]).unwrap(), // This unwrap is ok because we have at least 1 arg in the list
make::name_ref(&method_name.display(ctx.db()).to_string()), make::name_ref(&name),
arg_list, arg_list,
); );
let ret_type = method_source.ret_type(); let ret_type = method_source.ret_type();
@ -126,7 +123,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
let body = make::block_expr([], Some(tail_expr_finished)); let body = make::block_expr([], Some(tail_expr_finished));
let f = make::fn_( let f = make::fn_(
vis, vis,
name, fn_name,
type_params, type_params,
None, None,
params, params,