diff --git a/crates/ide_assists/src/handlers/generate_getter.rs b/crates/ide_assists/src/handlers/generate_getter.rs index fbd47d76111..c7739582446 100644 --- a/crates/ide_assists/src/handlers/generate_getter.rs +++ b/crates/ide_assists/src/handlers/generate_getter.rs @@ -135,39 +135,43 @@ fn test_generate_getter_from_field() { check_assist( generate_getter, r#" -struct Context { - dat$0a: T, -}"#, +struct Context { + dat$0a: Data, +} +"#, r#" -struct Context { - data: T, +struct Context { + data: Data, } -impl Context { +impl Context { /// Get a reference to the context's data. - fn data(&self) -> &T { + fn data(&self) -> &Data { &self.data } -}"#, +} +"#, ); check_assist( generate_getter_mut, r#" -struct Context { - dat$0a: T, -}"#, +struct Context { + dat$0a: Data, +} +"#, r#" -struct Context { - data: T, +struct Context { + data: Data, } -impl Context { +impl Context { /// Get a mutable reference to the context's data. - fn data_mut(&mut self) -> &mut T { + fn data_mut(&mut self) -> &mut Data { &mut self.data } -}"#, +} +"#, ); } @@ -176,29 +180,31 @@ fn test_generate_getter_already_implemented() { check_assist_not_applicable( generate_getter, r#" -struct Context { - dat$0a: T, +struct Context { + dat$0a: Data, } -impl Context { - fn data(&self) -> &T { +impl Context { + fn data(&self) -> &Data { &self.data } -}"#, +} +"#, ); check_assist_not_applicable( generate_getter_mut, r#" -struct Context { - dat$0a: T, +struct Context { + dat$0a: Data, } -impl Context { - fn data_mut(&mut self) -> &mut T { +impl Context { + fn data_mut(&mut self) -> &mut Data { &mut self.data } -}"#, +} +"#, ); } @@ -207,20 +213,22 @@ fn test_generate_getter_from_field_with_visibility_marker() { check_assist( generate_getter, r#" -pub(crate) struct Context { - dat$0a: T, -}"#, +pub(crate) struct Context { + dat$0a: Data, +} +"#, r#" -pub(crate) struct Context { - data: T, +pub(crate) struct Context { + data: Data, } -impl Context { +impl Context { /// Get a reference to the context's data. - pub(crate) fn data(&self) -> &T { + pub(crate) fn data(&self) -> &Data { &self.data } -}"#, +} +"#, ); } @@ -229,26 +237,27 @@ fn test_multiple_generate_getter() { check_assist( generate_getter, r#" -struct Context { - data: T, +struct Context { + data: Data, cou$0nt: usize, } -impl Context { +impl Context { /// Get a reference to the context's data. - fn data(&self) -> &T { + fn data(&self) -> &Data { &self.data } -}"#, +} +"#, r#" -struct Context { - data: T, +struct Context { + data: Data, count: usize, } -impl Context { +impl Context { /// Get a reference to the context's data. - fn data(&self) -> &T { + fn data(&self) -> &Data { &self.data } @@ -256,7 +265,8 @@ fn data(&self) -> &T { fn count(&self) -> &usize { &self.count } -}"#, +} +"#, ); } }