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

feat: Implement inline_method assist

Browse source
This commit is contained in:
Lukas Wirth 2021-07-03 01:33:34 +02:00
parent fbdcb49d48
commit 688398febc
9 changed files with 300 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -341,9 +341,9 @@ impl Param {
let var = self.var.name(ctx.db()).unwrap().to_string();
let var_name = make::name(&var);
let pat = match self.kind() {
ParamKind::MutValue => make::ident_mut_pat(var_name),
ParamKind::MutValue => make::ident_pat(false, true, var_name),
ParamKind::Value | ParamKind::SharedRef | ParamKind::MutRef => {
make::ident_pat(var_name)
make::ext::simple_ident_pat(var_name)
}
};
@ -1072,7 +1072,7 @@ impl FlowHandler {
}
FlowHandler::IfOption { action } => {
let path = make::ext::ident_path("Some");
let value_pat = make::ident_pat(make::name("value"));
let value_pat = make::ext::simple_ident_pat(make::name("value"));
let pattern = make::tuple_struct_pat(path, iter::once(value_pat.into()));
let cond = make::condition(call_expr, Some(pattern.into()));
let value = make::expr_path(make::ext::ident_path("value"));
@ -1086,7 +1086,7 @@ impl FlowHandler {
let some_arm = {
let path = make::ext::ident_path("Some");
let value_pat = make::ident_pat(make::name(some_name));
let value_pat = make::ext::simple_ident_pat(make::name(some_name));
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
let value = make::expr_path(make::ext::ident_path(some_name));
make::match_arm(iter::once(pat.into()), None, value)
@ -1105,14 +1105,14 @@ impl FlowHandler {
let ok_arm = {
let path = make::ext::ident_path("Ok");
let value_pat = make::ident_pat(make::name(ok_name));
let value_pat = make::ext::simple_ident_pat(make::name(ok_name));
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
let value = make::expr_path(make::ext::ident_path(ok_name));
make::match_arm(iter::once(pat.into()), None, value)
};
let err_arm = {
let path = make::ext::ident_path("Err");
let value_pat = make::ident_pat(make::name(err_name));
let value_pat = make::ext::simple_ident_pat(make::name(err_name));
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
let value = make::expr_path(make::ext::ident_path(err_name));
make::match_arm(