aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ihara <[email protected]>2021-06-21 10:42:25 +0100
committerDaiki Ihara <[email protected]>2021-06-21 10:42:25 +0100
commit7a04f72220736025820adb7ac5c9b2ce41e4a4c2 (patch)
tree42b46857f32de044330d9dbd1b2bdf2844901e88
parentcd1ef8de1829d7ec17015f5cd02b476cd0d1d889 (diff)
Fix pointed out
-rw-r--r--crates/ide_assists/src/handlers/extract_function.rs21
1 files changed, 16 insertions, 5 deletions
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 62edc4850..6a9a84da0 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -109,10 +109,15 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
109 109
110 let new_indent = IndentLevel::from_node(&insert_after); 110 let new_indent = IndentLevel::from_node(&insert_after);
111 let old_indent = fun.body.indent_level(); 111 let old_indent = fun.body.indent_level();
112 let is_body_contains_await = body_contains_await(&fun.body);
112 113
113 builder.replace(target_range, format_replacement(ctx, &fun, old_indent)); 114 builder.replace(
115 target_range,
116 format_replacement(ctx, &fun, old_indent, is_body_contains_await),
117 );
114 118
115 let fn_def = format_function(ctx, module, &fun, old_indent, new_indent); 119 let fn_def =
120 format_function(ctx, module, &fun, old_indent, new_indent, is_body_contains_await);
116 let insert_offset = insert_after.text_range().end(); 121 let insert_offset = insert_after.text_range().end();
117 match ctx.config.snippet_cap { 122 match ctx.config.snippet_cap {
118 Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def), 123 Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def),
@@ -954,7 +959,12 @@ fn scope_for_fn_insertion_node(node: &SyntaxNode, anchor: Anchor) -> Option<Synt
954 last_ancestor 959 last_ancestor
955} 960}
956 961
957fn format_replacement(ctx: &AssistContext, fun: &Function, indent: IndentLevel) -> String { 962fn format_replacement(
963 ctx: &AssistContext,
964 fun: &Function,
965 indent: IndentLevel,
966 is_body_contains_await: bool,
967) -> String {
958 let ret_ty = fun.return_type(ctx); 968 let ret_ty = fun.return_type(ctx);
959 969
960 let args = fun.params.iter().map(|param| param.to_arg(ctx)); 970 let args = fun.params.iter().map(|param| param.to_arg(ctx));
@@ -994,7 +1004,7 @@ fn format_replacement(ctx: &AssistContext, fun: &Function, indent: IndentLevel)
994 } 1004 }
995 } 1005 }
996 format_to!(buf, "{}", expr); 1006 format_to!(buf, "{}", expr);
997 if body_contains_await(&fun.body) { 1007 if is_body_contains_await {
998 buf.push_str(".await"); 1008 buf.push_str(".await");
999 } 1009 }
1000 if fun.ret_ty.is_unit() 1010 if fun.ret_ty.is_unit()
@@ -1125,12 +1135,13 @@ fn format_function(
1125 fun: &Function, 1135 fun: &Function,
1126 old_indent: IndentLevel, 1136 old_indent: IndentLevel,
1127 new_indent: IndentLevel, 1137 new_indent: IndentLevel,
1138 is_body_contains_await: bool,
1128) -> String { 1139) -> String {
1129 let mut fn_def = String::new(); 1140 let mut fn_def = String::new();
1130 let params = make_param_list(ctx, module, fun); 1141 let params = make_param_list(ctx, module, fun);
1131 let ret_ty = make_ret_ty(ctx, module, fun); 1142 let ret_ty = make_ret_ty(ctx, module, fun);
1132 let body = make_body(ctx, old_indent, new_indent, fun); 1143 let body = make_body(ctx, old_indent, new_indent, fun);
1133 let async_kw = if body_contains_await(&fun.body) { "async " } else { "" }; 1144 let async_kw = if is_body_contains_await { "async " } else { "" };
1134 match ctx.config.snippet_cap { 1145 match ctx.config.snippet_cap {
1135 Some(_) => format_to!(fn_def, "\n\n{}{}fn $0{}{}", new_indent, async_kw, fun.name, params), 1146 Some(_) => format_to!(fn_def, "\n\n{}{}fn $0{}{}", new_indent, async_kw, fun.name, params),
1136 None => format_to!(fn_def, "\n\n{}{}fn {}{}", new_indent, async_kw, fun.name, params), 1147 None => format_to!(fn_def, "\n\n{}{}fn {}{}", new_indent, async_kw, fun.name, params),