Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

use make::name_ref

Browse source
This commit is contained in:
Yoshua Wuyts 2021-08-08 16:31:28 +02:00
parent e26ba72333
commit dcbf385ffc
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
View file

@ -218,11 +218,12 @@ fn gen_debug_impl(adt: &ast::Adt, func: &ast::Fn, annotated_name: &ast::Name) {
let expr = match strukt.field_list() { let expr = match strukt.field_list() {
None => { None => {
// => f.debug_struct("Name").finish() // => f.debug_struct("Name").finish()
make::expr_method_call(target, "debug_struct", args) make::expr_method_call(target, make::name_ref("debug_struct"), args)
} }
Some(ast::FieldList::RecordFieldList(field_list)) => { Some(ast::FieldList::RecordFieldList(field_list)) => {
// => f.debug_struct("Name").field("foo", &self.foo).finish() // => f.debug_struct("Name").field("foo", &self.foo).finish()
let mut expr = make::expr_method_call(target, "debug_struct", args); let method = make::name_ref("debug_struct");
let mut expr = make::expr_method_call(target, method, args);
for field in field_list.fields() { for field in field_list.fields() {
if let Some(name) = field.name() { if let Some(name) = field.name() {
let f_name = make::expr_literal(&(format!("\"{}\"", name))).into(); let f_name = make::expr_literal(&(format!("\"{}\"", name))).into();
@ -230,25 +231,28 @@ fn gen_debug_impl(adt: &ast::Adt, func: &ast::Fn, annotated_name: &ast::Name) {
let f_path = make::expr_ref(f_path, false); let f_path = make::expr_ref(f_path, false);
let f_path = make::expr_field(f_path, &format!("{}", name)).into(); let f_path = make::expr_field(f_path, &format!("{}", name)).into();
let args = make::arg_list(vec![f_name, f_path]); let args = make::arg_list(vec![f_name, f_path]);
expr = make::expr_method_call(expr, "field", args); expr = make::expr_method_call(expr, make::name_ref("field"), args);
} }
} }
expr expr
} }
Some(ast::FieldList::TupleFieldList(field_list)) => { Some(ast::FieldList::TupleFieldList(field_list)) => {
// => f.debug_tuple("Name").field(self.0).finish() // => f.debug_tuple("Name").field(self.0).finish()
let mut expr = make::expr_method_call(target, "debug_tuple", args); let method = make::name_ref("debug_tuple");
let mut expr = make::expr_method_call(target, method, args);
for (idx, _) in field_list.fields().enumerate() { for (idx, _) in field_list.fields().enumerate() {
let f_path = make::expr_path(make::ext::ident_path("self")); let f_path = make::expr_path(make::ext::ident_path("self"));
let f_path = make::expr_ref(f_path, false); let f_path = make::expr_ref(f_path, false);
let f_path = make::expr_field(f_path, &format!("{}", idx)).into(); let f_path = make::expr_field(f_path, &format!("{}", idx)).into();
expr = make::expr_method_call(expr, "field", make::arg_list(Some(f_path))); let method = make::name_ref("field");
expr = make::expr_method_call(expr, method, make::arg_list(Some(f_path)));
} }
expr expr
} }
}; };
let expr = make::expr_method_call(expr, "finish", make::arg_list(None)); let method = make::name_ref("finish");
let expr = make::expr_method_call(expr, method, make::arg_list(None));
let body = make::block_expr(None, Some(expr)).indent(ast::edit::IndentLevel(1)); let body = make::block_expr(None, Some(expr)).indent(ast::edit::IndentLevel(1));
ted::replace(func.body().unwrap().syntax(), body.clone_for_update().syntax()); ted::replace(func.body().unwrap().syntax(), body.clone_for_update().syntax());
} }