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

Auto merge of #15429 - alibektas:deunwrap/generate_delegate_methods, r=Veykril

Browse Source 
minor : Deunwrap generate_delegate_methods

#15398 subtask 8
This commit is contained in:
bors 2023-08-15 07:15:25 +00:00
commit c18ce9a08b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,9 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else { let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else {
continue; continue;
}; };
let field = make::ext::field_from_idents(["self", &field_name])?;
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),
@ -115,11 +118,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
Some(list) => convert_param_list_to_arg_list(list), Some(list) => convert_param_list_to_arg_list(list),
None => make::arg_list([]), None => make::arg_list([]),
}; };
let tail_expr = make::expr_method_call( let tail_expr = make::expr_method_call(field, make::name_ref(&name), arg_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(&name),
arg_list,
);
let ret_type = method_source.ret_type(); let ret_type = method_source.ret_type();
let is_async = method_source.async_token().is_some(); let is_async = method_source.async_token().is_some();
let is_const = method_source.const_token().is_some(); let is_const = method_source.const_token().is_some();