From 5070534d323b5fe202a32450bc424201bab097fa Mon Sep 17 00:00:00 2001 From: roife Date: Wed, 13 Dec 2023 11:42:45 +0800 Subject: fix: testcases in `generate_delegate_trait` --- .../src/handlers/generate_delegate_trait.rs | 44 +++++++++++++--------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/crates/ide-assists/src/handlers/generate_delegate_trait.rs b/crates/ide-assists/src/handlers/generate_delegate_trait.rs index 0728c587ee0..0d34502add9 100644 --- a/crates/ide-assists/src/handlers/generate_delegate_trait.rs +++ b/crates/ide-assists/src/handlers/generate_delegate_trait.rs @@ -1032,28 +1032,29 @@ struct B { } trait Trait { - fn f(a: T); + fn f(&self, a: T) -> T; } impl Trait for B { - fn f(a: T1) -> T2 { self.a } + fn f(&self, a: T1) -> T1 { a } } struct A {} struct S { - b$0 : B, -}"#, + b :$0 B, +} +"#, r#" struct B { a: T } trait Trait { - fn f(a: T); + fn f(&self, a: T) -> T; } impl Trait for B { - fn f(a: T1) -> T2 { self.a } + fn f(&self, a: T1) -> T1 { a } } struct A {} @@ -1062,10 +1063,11 @@ struct S { } impl Trait for S { - fn f(a: T1) -> A { - as Trait>::f(a) + fn f(&self, a: T1) -> T1 { + as Trait>::f(&self.b, a) } -}"#, +} +"#, ); } @@ -1088,7 +1090,8 @@ impl Trait for B { struct S { b : $0B, -}"#, +} +"#, r#" struct B { a: T @@ -1110,7 +1113,8 @@ impl Trait for S { fn f(&self, a: T) -> T { as Trait>::f(&self.b, a) } -}"#, +} +"#, ); } @@ -1133,7 +1137,8 @@ impl<'a, T, T0> Trait for B<'a, T0> { struct S<'a, T> { b : $0B<'a, T>, -}"#, +} +"#, r#" struct B<'a, T> { a: &'a T @@ -1155,7 +1160,8 @@ impl<'a, T, T1> Trait for S<'a, T1> { fn f(&self, a: T) -> T { as Trait>::f(&self.b, a) } -}"#, +} +"#, ); } @@ -1179,7 +1185,8 @@ impl Trait for B { struct S { b :$0 B, -}"#, +} +"#, r#" struct B { a: T1, @@ -1202,7 +1209,8 @@ impl Trait for S { fn f(&self, a: i32) -> i32 { as Trait>::f(&self.b, a) } -}"#, +} +"#, ); } @@ -1225,7 +1233,8 @@ impl Trait for B { struct S { b : $0B, -}"#, +} +"#, r#" struct B { a: T @@ -1247,7 +1256,8 @@ impl Trait for S { fn f(&self, a: T0) -> T0 { as Trait>::f(&self.b, a) } -}"#, +} +"#, ); } -- cgit 1.4.1-3-g733a5