Skip to content

Commit 688398f

Browse files
committed
feat: Implement inline_method assist
1 parent fbdcb49 commit 688398f

File tree

9 files changed

+300
-72
lines changed

9 files changed

+300
-72
lines changed

crates/ide_assists/src/handlers/early_return.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
127127
let happy_arm = {
128128
let pat = make::tuple_struct_pat(
129129
path,
130-
once(make::ident_pat(make::name("it")).into()),
130+
once(make::ext::simple_ident_pat(make::name("it")).into()),
131131
);
132132
let expr = {
133133
let path = make::ext::ident_path("it");

crates/ide_assists/src/handlers/extract_function.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,9 @@ impl Param {
341341
let var = self.var.name(ctx.db()).unwrap().to_string();
342342
let var_name = make::name(&var);
343343
let pat = match self.kind() {
344-
ParamKind::MutValue => make::ident_mut_pat(var_name),
344+
ParamKind::MutValue => make::ident_pat(false, true, var_name),
345345
ParamKind::Value | ParamKind::SharedRef | ParamKind::MutRef => {
346-
make::ident_pat(var_name)
346+
make::ext::simple_ident_pat(var_name)
347347
}
348348
};
349349

@@ -1072,7 +1072,7 @@ impl FlowHandler {
10721072
}
10731073
FlowHandler::IfOption { action } => {
10741074
let path = make::ext::ident_path("Some");
1075-
let value_pat = make::ident_pat(make::name("value"));
1075+
let value_pat = make::ext::simple_ident_pat(make::name("value"));
10761076
let pattern = make::tuple_struct_pat(path, iter::once(value_pat.into()));
10771077
let cond = make::condition(call_expr, Some(pattern.into()));
10781078
let value = make::expr_path(make::ext::ident_path("value"));
@@ -1086,7 +1086,7 @@ impl FlowHandler {
10861086

10871087
let some_arm = {
10881088
let path = make::ext::ident_path("Some");
1089-
let value_pat = make::ident_pat(make::name(some_name));
1089+
let value_pat = make::ext::simple_ident_pat(make::name(some_name));
10901090
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
10911091
let value = make::expr_path(make::ext::ident_path(some_name));
10921092
make::match_arm(iter::once(pat.into()), None, value)
@@ -1105,14 +1105,14 @@ impl FlowHandler {
11051105

11061106
let ok_arm = {
11071107
let path = make::ext::ident_path("Ok");
1108-
let value_pat = make::ident_pat(make::name(ok_name));
1108+
let value_pat = make::ext::simple_ident_pat(make::name(ok_name));
11091109
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
11101110
let value = make::expr_path(make::ext::ident_path(ok_name));
11111111
make::match_arm(iter::once(pat.into()), None, value)
11121112
};
11131113
let err_arm = {
11141114
let path = make::ext::ident_path("Err");
1115-
let value_pat = make::ident_pat(make::name(err_name));
1115+
let value_pat = make::ext::simple_ident_pat(make::name(err_name));
11161116
let pat = make::tuple_struct_pat(path, iter::once(value_pat.into()));
11171117
let value = make::expr_path(make::ext::ident_path(err_name));
11181118
make::match_arm(

crates/ide_assists/src/handlers/fill_match_arms.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,9 @@ fn build_pat(db: &RootDatabase, module: hir::Module, var: ExtendedVariant) -> Op
262262
make::tuple_struct_pat(path, pats).into()
263263
}
264264
ast::StructKind::Record(field_list) => {
265-
let pats =
266-
field_list.fields().map(|f| make::ident_pat(f.name().unwrap()).into());
265+
let pats = field_list
266+
.fields()
267+
.map(|f| make::ext::simple_ident_pat(f.name().unwrap()).into());
267268
make::record_pat(path, pats).into()
268269
}
269270
ast::StructKind::Unit => make::path_pat(path),

crates/ide_assists/src/handlers/generate_function.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,9 @@ fn fn_args(
256256
});
257257
}
258258
deduplicate_arg_names(&mut arg_names);
259-
let params = arg_names
260-
.into_iter()
261-
.zip(arg_types)
262-
.map(|(name, ty)| make::param(make::ident_pat(make::name(&name)).into(), make::ty(&ty)));
259+
let params = arg_names.into_iter().zip(arg_types).map(|(name, ty)| {
260+
make::param(make::ext::simple_ident_pat(make::name(&name)).into(), make::ty(&ty))
261+
});
263262
Some((None, make::param_list(None, params)))
264263
}
265264

0 commit comments

Comments
 (0)