language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify

Browse source
This commit is contained in:
Lukas Wirth 2021-08-07 22:16:15 +02:00
parent 80f522091a
commit c4a119f433
8 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ide_assists/src/handlers/extract_function.rs
View file

@ -100,7 +100,7 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
body.extracted_function_params(ctx, &container_info, locals_used.iter().copied());
let fun = Function {
name: "fun_name".to_string(),
name: make::name_ref("fun_name"),
self_param,
params,
control_flow,
@ -170,7 +170,7 @@ fn extraction_target(node: &SyntaxNode, selection_range: TextRange) -> Option<Fu
#[derive(Debug)]
struct Function {
name: String,
name: ast::NameRef,
self_param: Option<ast::SelfParam>,
params: Vec<Param>,
control_flow: ControlFlow,
@ -1077,11 +1077,12 @@ fn make_call(ctx: &AssistContext, fun: &Function, indent: IndentLevel) -> String
let args = fun.params.iter().map(|param| param.to_arg(ctx));
let args = make::arg_list(args);
let name = fun.name.clone();
let call_expr = if fun.self_param.is_some() {
let self_arg = make::expr_path(make::ext::ident_path("self"));
make::expr_method_call(self_arg, &fun.name, args)
make::expr_method_call(self_arg, name, args)
} else {
let func = make::expr_path(make::ext::ident_path(&fun.name));
let func = make::expr_path(make::path_unqualified(make::path_segment(name)));
make::expr_call(func, args)
};