language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-19 01:50:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

debug for record field structs

Browse source
This commit is contained in:
Yoshua Wuyts 2021-08-08 13:50:49 +02:00
parent e2ab2e12a0
commit fd7236c791
3 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ use crate::{
// //
// impl Debug for S { // impl Debug for S {
// $0fn fmt(&self, f: &mut Formatter) -> Result<()> { // $0fn fmt(&self, f: &mut Formatter) -> Result<()> {
// f.debug_struct(S) // f.debug_struct("S").finish()
// } // }
// } // }
// ``` // ```
@ -183,25 +183,37 @@ fn gen_debug_impl(adt: &ast::Adt, fn_: &ast::Fn, annotated_name: &ast::Name) {
match adt { match adt {
ast::Adt::Union(_) => {} // `Debug` cannot be derived for unions, so no default impl can be provided. ast::Adt::Union(_) => {} // `Debug` cannot be derived for unions, so no default impl can be provided.
ast::Adt::Enum(_) => {} // TODO ast::Adt::Enum(_) => {} // TODO
ast::Adt::Struct(strukt) => { ast::Adt::Struct(strukt) => match strukt.field_list() {
match strukt.field_list() { Some(ast::FieldList::RecordFieldList(field_list)) => {
Some(ast::FieldList::RecordFieldList(field_list)) => { let name = format!("\"{}\"", annotated_name);
let name = format!("\"{}\"", annotated_name); let args = make::arg_list(Some(make::expr_literal(&name).into()));
let args = make::arg_list(Some(make::expr_literal(&name).into())); let target = make::expr_path(make::ext::ident_path("f"));
let target = make::expr_path(make::ext::ident_path("f")); let mut expr = make::expr_method_call(target, "debug_struct", args);
let mut expr = make::expr_method_call(target, "debug_struct", args); for field in field_list.fields() {
for field in field_list.fields() { if let Some(name) = field.name() {
let args = make::arg_list(Some(make::expr_path(&name).into())); let f_name = make::expr_literal(&(format!("\"{}\"", name))).into();
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_field(f_path, &format!("{}", name)).into();
let args = make::arg_list(vec![f_name, f_path]);
expr = make::expr_method_call(expr, "field", args); expr = make::expr_method_call(expr, "field", args);
} }
let expr = make::expr_method_call(expr, "finish", make::arg_list(None));
let body = make::block_expr(None, Some(expr)).indent(ast::edit::IndentLevel(1));
ted::replace(fn_.body().unwrap().syntax(), body.clone_for_update().syntax());
} }
Some(ast::FieldList::TupleFieldList(field_list)) => {} let expr = make::expr_method_call(expr, "finish", make::arg_list(None));
None => {} // `Debug` cannot be implemented for an incomplete struct. let body = make::block_expr(None, Some(expr)).indent(ast::edit::IndentLevel(1));
ted::replace(fn_.body().unwrap().syntax(), body.clone_for_update().syntax());
} }
} Some(ast::FieldList::TupleFieldList(field_list)) => {}
None => {
let name = format!("\"{}\"", annotated_name);
let args = make::arg_list(Some(make::expr_literal(&name).into()));
let target = make::expr_path(make::ext::ident_path("f"));
let expr = make::expr_method_call(target, "debug_struct", args);
let expr = make::expr_method_call(expr, "finish", make::arg_list(None));
let body = make::block_expr(None, Some(expr)).indent(ast::edit::IndentLevel(1));
ted::replace(fn_.body().unwrap().syntax(), body.clone_for_update().syntax());
}
},
} }
} }

2
crates/ide_assists/src/tests/generated.rs
View file

@ -1364,7 +1364,7 @@ struct S;
impl Debug for S { impl Debug for S {
$0fn fmt(&self, f: &mut Formatter) -> Result<()> { $0fn fmt(&self, f: &mut Formatter) -> Result<()> {
f.debug_struct(S) f.debug_struct("S").finish()
} }
} }
"#####, "#####,

3
crates/syntax/src/ast/make.rs
View file

@ -318,6 +318,9 @@ pub fn expr_closure(pats: impl IntoIterator<Item = ast::Param>, expr: ast::Expr)
let params = pats.into_iter().join(", "); let params = pats.into_iter().join(", ");
expr_from_text(&format!("|{}| {}", params, expr)) expr_from_text(&format!("|{}| {}", params, expr))
} }
pub fn expr_field(receiver: ast::Expr, field: &str) -> ast::Expr {
expr_from_text(&format!("{}.{}", receiver, field))
}
pub fn expr_paren(expr: ast::Expr) -> ast::Expr { pub fn expr_paren(expr: ast::Expr) -> ast::Expr {
expr_from_text(&format!("({})", expr)) expr_from_text(&format!("({})", expr))
} }