From 3f0222565d8a4f8e60c5f175305d29dc9af0b3a5 Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Sat, 15 May 2021 11:29:33 +0800 Subject: Generate the impl block via generate_trait_impl_text --- .../src/handlers/generate_default_from_new.rs | 47 +++++++++++++++++++++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/crates/ide_assists/src/handlers/generate_default_from_new.rs b/crates/ide_assists/src/handlers/generate_default_from_new.rs index dc14552d6..374611fbf 100644 --- a/crates/ide_assists/src/handlers/generate_default_from_new.rs +++ b/crates/ide_assists/src/handlers/generate_default_from_new.rs @@ -7,6 +7,7 @@ use syntax::{ ast::{self, Impl, NameOwner}, AstNode, }; +use crate::utils::generate_trait_impl_text; // Assist: generate_default_from_new // @@ -59,13 +60,21 @@ pub(crate) fn generate_default_from_new(acc: &mut Assists, ctx: &AssistContext) } let insert_location = impl_.syntax().text_range(); - + let code = match ast::Struct::cast(impl_.self_ty().unwrap().syntax().clone()){ + None => { + default_fn_node_for_new(impl_) + } + Some(strukt) => { + generate_trait_impl_text(&ast::Adt::Struct(strukt),"core:default:Default"," fn default() -> Self {{ + Self::new() + }}") + } + }; acc.add( AssistId("generate_default_from_new", crate::AssistKind::Generate), "Generate a Default impl from a new fn", insert_location, move |builder| { - let code = default_fn_node_for_new(impl_); builder.insert(insert_location.end(), code); }, ) @@ -175,6 +184,40 @@ impl Default for Test { ); } + #[test] + fn generate_default3() { + check_pass( + r#" +pub struct Foo { + _bar: *mut T, +} + +impl Foo { + pub fn ne$0w() -> Self { + todo!() + } +} +"#, + r#" +pub struct Foo { + _bar: *mut T, +} + +impl Foo { + pub fn new() -> Self { + todo!() + } +} + +impl Default for Foo { + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + #[test] fn new_function_with_parameters() { cov_mark::check!(new_function_with_parameters); -- cgit v1.2.3 From 696a8bf870ba7df15e54ebabbc72813c93f8d279 Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Sat, 15 May 2021 20:07:32 +0800 Subject: Address comments and add more tests Fix tests Fmt code --- .../src/handlers/generate_default_from_new.rs | 274 +++++++++++++++++++-- 1 file changed, 249 insertions(+), 25 deletions(-) diff --git a/crates/ide_assists/src/handlers/generate_default_from_new.rs b/crates/ide_assists/src/handlers/generate_default_from_new.rs index 374611fbf..f301932ad 100644 --- a/crates/ide_assists/src/handlers/generate_default_from_new.rs +++ b/crates/ide_assists/src/handlers/generate_default_from_new.rs @@ -3,11 +3,12 @@ use crate::{ AssistId, }; use ide_db::helpers::FamousDefs; +use itertools::Itertools; +use stdx::format_to; use syntax::{ - ast::{self, Impl, NameOwner}, + ast::{self, AttrsOwner, GenericParamsOwner, Impl, NameOwner, TypeBoundsOwner}, AstNode, }; -use crate::utils::generate_trait_impl_text; // Assist: generate_default_from_new // @@ -60,37 +61,66 @@ pub(crate) fn generate_default_from_new(acc: &mut Assists, ctx: &AssistContext) } let insert_location = impl_.syntax().text_range(); - let code = match ast::Struct::cast(impl_.self_ty().unwrap().syntax().clone()){ - None => { - default_fn_node_for_new(impl_) - } - Some(strukt) => { - generate_trait_impl_text(&ast::Adt::Struct(strukt),"core:default:Default"," fn default() -> Self {{ - Self::new() - }}") - } - }; + acc.add( AssistId("generate_default_from_new", crate::AssistKind::Generate), "Generate a Default impl from a new fn", insert_location, move |builder| { + let default_code = " fn default() -> Self { + Self::new() + }"; + let code = generate_trait_impl_text_from_impl(&impl_, "Default", default_code); builder.insert(insert_location.end(), code); }, ) } -fn default_fn_node_for_new(impl_: Impl) -> String { - format!( - " +fn generate_trait_impl_text_from_impl(impl_: &ast::Impl, trait_text: &str, code: &str) -> String { + let generic_params = impl_.generic_param_list(); + let mut buf = String::with_capacity(code.len()); + buf.push_str("\n\n"); + impl_ + .attrs() + .filter(|attr| attr.as_simple_call().map(|(name, _arg)| name == "cfg").unwrap_or(false)) + .for_each(|attr| buf.push_str(format!("{}\n", attr.to_string()).as_str())); + buf.push_str("impl"); + + if let Some(generic_params) = &generic_params { + let lifetimes = generic_params.lifetime_params().map(|lt| format!("{}", lt.syntax())); + let type_params = generic_params.type_params().map(|type_param| { + let mut buf = String::new(); + if let Some(it) = type_param.name() { + format_to!(buf, "{}", it.syntax()); + } + if let Some(it) = type_param.colon_token() { + format_to!(buf, "{} ", it); + } + if let Some(it) = type_param.type_bound_list() { + format_to!(buf, "{}", it.syntax()); + } + buf + }); + let const_params = generic_params.const_params().map(|t| t.syntax().to_string()); + let generics = lifetimes.chain(type_params).chain(const_params).format(", "); + format_to!(buf, "<{}>", generics); + } + + buf.push(' '); + buf.push_str(trait_text); + buf.push_str(" for "); + buf.push_str(&impl_.self_ty().unwrap().syntax().text().to_string()); + + match impl_.where_clause() { + Some(where_clause) => { + format_to!(buf, "\n{}\n{{\n{}\n}}", where_clause, code); + } + None => { + format_to!(buf, " {{\n{}\n}}", code); + } + } -impl Default for {} {{ - fn default() -> Self {{ - Self::new() - }} -}}", - impl_.self_ty().unwrap().syntax().text() - ) + buf } fn is_default_implemented(ctx: &AssistContext, impl_: &Impl) -> bool { @@ -185,7 +215,7 @@ impl Default for Test { } #[test] - fn generate_default3() { + fn new_function_with_generic() { check_pass( r#" pub struct Foo { @@ -194,7 +224,7 @@ pub struct Foo { impl Foo { pub fn ne$0w() -> Self { - todo!() + unimplemented!() } } "#, @@ -205,7 +235,7 @@ pub struct Foo { impl Foo { pub fn new() -> Self { - todo!() + unimplemented!() } } @@ -218,6 +248,200 @@ impl Default for Foo { ); } + #[test] + fn new_function_with_generics() { + check_pass( + r#" +pub struct Foo { + _tars: *mut T, + _bar: *mut B, +} + +impl Foo { + pub fn ne$0w() -> Self { + unimplemented!() + } +} +"#, + r#" +pub struct Foo { + _tars: *mut T, + _bar: *mut B, +} + +impl Foo { + pub fn new() -> Self { + unimplemented!() + } +} + +impl Default for Foo { + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + + #[test] + fn new_function_with_generic_and_bound() { + check_pass( + r#" +pub struct Foo { + t: T, +} + +impl> Foo { + pub fn ne$0w() -> Self { + Foo { t: 0.into() } + } +} +"#, + r#" +pub struct Foo { + t: T, +} + +impl> Foo { + pub fn new() -> Self { + Foo { t: 0.into() } + } +} + +impl> Default for Foo { + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + + #[test] + fn new_function_with_generics_and_bounds() { + check_pass( + r#" +pub struct Foo { + _tars: T, + _bar: B, +} + +impl, B: From> Foo { + pub fn ne$0w() -> Self { + unimplemented!() + } +} +"#, + r#" +pub struct Foo { + _tars: T, + _bar: B, +} + +impl, B: From> Foo { + pub fn new() -> Self { + unimplemented!() + } +} + +impl, B: From> Default for Foo { + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + + #[test] + fn new_function_with_generic_and_where() { + check_pass( + r#" +pub struct Foo { + t: T, +} + +impl> Foo +where + Option: Debug +{ + pub fn ne$0w() -> Self { + Foo { t: 0.into() } + } +} +"#, + r#" +pub struct Foo { + t: T, +} + +impl> Foo +where + Option: Debug +{ + pub fn new() -> Self { + Foo { t: 0.into() } + } +} + +impl> Default for Foo +where + Option: Debug +{ + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + + #[test] + fn new_function_with_generics_and_wheres() { + check_pass( + r#" +pub struct Foo { + _tars: T, + _bar: B, +} + +impl, B: From> Foo +where + Option: Debug, Option: Debug, +{ + pub fn ne$0w() -> Self { + unimplemented!() + } +} +"#, + r#" +pub struct Foo { + _tars: T, + _bar: B, +} + +impl, B: From> Foo +where + Option: Debug, Option: Debug, +{ + pub fn new() -> Self { + unimplemented!() + } +} + +impl, B: From> Default for Foo +where + Option: Debug, Option: Debug, +{ + fn default() -> Self { + Self::new() + } +} +"#, + ); + } + #[test] fn new_function_with_parameters() { cov_mark::check!(new_function_with_parameters); -- cgit v1.2.3 From f5ea2a2ab0df1a8ccf9f20d97ca07f9169e70c79 Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Sat, 15 May 2021 21:12:06 +0800 Subject: Remove attrs --- crates/ide_assists/src/handlers/generate_default_from_new.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/ide_assists/src/handlers/generate_default_from_new.rs b/crates/ide_assists/src/handlers/generate_default_from_new.rs index f301932ad..bad826366 100644 --- a/crates/ide_assists/src/handlers/generate_default_from_new.rs +++ b/crates/ide_assists/src/handlers/generate_default_from_new.rs @@ -6,7 +6,7 @@ use ide_db::helpers::FamousDefs; use itertools::Itertools; use stdx::format_to; use syntax::{ - ast::{self, AttrsOwner, GenericParamsOwner, Impl, NameOwner, TypeBoundsOwner}, + ast::{self, GenericParamsOwner, Impl, NameOwner, TypeBoundsOwner}, AstNode, }; @@ -80,10 +80,6 @@ fn generate_trait_impl_text_from_impl(impl_: &ast::Impl, trait_text: &str, code: let generic_params = impl_.generic_param_list(); let mut buf = String::with_capacity(code.len()); buf.push_str("\n\n"); - impl_ - .attrs() - .filter(|attr| attr.as_simple_call().map(|(name, _arg)| name == "cfg").unwrap_or(false)) - .for_each(|attr| buf.push_str(format!("{}\n", attr.to_string()).as_str())); buf.push_str("impl"); if let Some(generic_params) = &generic_params { -- cgit v1.2.3