language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix var name

Browse source
This commit is contained in:
Daiki Ihara 2021-06-21 22:47:39 +09:00
parent 7a04f72220
commit 873aa904f2
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,15 +109,15 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
let new_indent = IndentLevel::from_node(&insert_after); let new_indent = IndentLevel::from_node(&insert_after);
let old_indent = fun.body.indent_level(); let old_indent = fun.body.indent_level();
let is_body_contains_await = body_contains_await(&fun.body); let body_contains_await = body_contains_await(&fun.body);
builder.replace( builder.replace(
target_range, target_range,
format_replacement(ctx, &fun, old_indent, is_body_contains_await), format_replacement(ctx, &fun, old_indent, body_contains_await),
); );
let fn_def = let fn_def =
format_function(ctx, module, &fun, old_indent, new_indent, is_body_contains_await); format_function(ctx, module, &fun, old_indent, new_indent, body_contains_await);
let insert_offset = insert_after.text_range().end(); let insert_offset = insert_after.text_range().end();
match ctx.config.snippet_cap { match ctx.config.snippet_cap {
Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def), Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def),
@ -963,7 +963,7 @@ fn format_replacement(
ctx: &AssistContext, ctx: &AssistContext,
fun: &Function, fun: &Function,
indent: IndentLevel, indent: IndentLevel,
is_body_contains_await: bool, body_contains_await: bool,
) -> String { ) -> String {
let ret_ty = fun.return_type(ctx); let ret_ty = fun.return_type(ctx);
@ -1004,7 +1004,7 @@ fn format_replacement(
} }
} }
format_to!(buf, "{}", expr); format_to!(buf, "{}", expr);
if is_body_contains_await { if body_contains_await {
buf.push_str(".await"); buf.push_str(".await");
} }
if fun.ret_ty.is_unit() if fun.ret_ty.is_unit()
@ -1135,13 +1135,13 @@ fn format_function(
fun: &Function, fun: &Function,
old_indent: IndentLevel, old_indent: IndentLevel,
new_indent: IndentLevel, new_indent: IndentLevel,
is_body_contains_await: bool, body_contains_await: bool,
) -> String { ) -> String {
let mut fn_def = String::new(); let mut fn_def = String::new();
let params = make_param_list(ctx, module, fun); let params = make_param_list(ctx, module, fun);
let ret_ty = make_ret_ty(ctx, module, fun); let ret_ty = make_ret_ty(ctx, module, fun);
let body = make_body(ctx, old_indent, new_indent, fun); let body = make_body(ctx, old_indent, new_indent, fun);
let async_kw = if is_body_contains_await { "async " } else { "" }; let async_kw = if body_contains_await { "async " } else { "" };
match ctx.config.snippet_cap { match ctx.config.snippet_cap {
Some(_) => format_to!(fn_def, "\n\n{}{}fn $0{}{}", new_indent, async_kw, fun.name, params), Some(_) => format_to!(fn_def, "\n\n{}{}fn $0{}{}", new_indent, async_kw, fun.name, params),
None => format_to!(fn_def, "\n\n{}{}fn {}{}", new_indent, async_kw, fun.name, params), None => format_to!(fn_def, "\n\n{}{}fn {}{}", new_indent, async_kw, fun.name, params),