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

Merge #7880

Browse Source 
7880: Honor snippet capability when using the extract function assist r=lnicola a=Arthamys

This fixes issue #7793

Co-authored-by: san <san@alien.parts>
This commit is contained in:
bors[bot] 2021-03-05 16:24:32 +00:00 committed by GitHub
commit 2b55cce49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ide_assists/src/handlers/extract_function.rs
View File

@ -112,7 +112,10 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
let fn_def = format_function(ctx, module, &fun, old_indent, new_indent); let fn_def = format_function(ctx, module, &fun, old_indent, new_indent);
let insert_offset = insert_after.text_range().end(); let insert_offset = insert_after.text_range().end();
builder.insert(insert_offset, fn_def); match ctx.config.snippet_cap {
Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def),
None => builder.insert(insert_offset, fn_def),
}
}, },
) )
} }
@ -1079,7 +1082,10 @@ fn format_function(
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);
format_to!(fn_def, "\n\n{}fn $0{}{}", new_indent, fun.name, params); match ctx.config.snippet_cap {
Some(_) => format_to!(fn_def, "\n\n{}fn $0{}{}", new_indent, fun.name, params),
None => format_to!(fn_def, "\n\n{}fn {}{}", new_indent, fun.name, params),
}
if let Some(ret_ty) = ret_ty { if let Some(ret_ty) = ret_ty {
format_to!(fn_def, " {}", ret_ty); format_to!(fn_def, " {}", ret_ty);
} }