bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
fix: generate-method skips trait impl blocks when picking insertion site
Browse Source
Brumbelow 4 weeks ago
parent 0705955 · commit 849c42f
Diffstat
-rw-r--r--crates/ide-assists/src/handlers/generate_function.rs82
1 files changed, 81 insertions, 1 deletions
diff --git a/crates/ide-assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
index 6ef492619b..e1e456fd5e 100644
--- a/crates/ide-assists/src/handlers/generate_function.rs
+++ b/crates/ide-assists/src/handlers/generate_function.rs
@@ -148,7 +148,9 @@ fn gen_method(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let enclosing_impl = ctx.find_node_at_offset::<ast::Impl>();
let cursor_impl = enclosing_impl.filter(|impl_| {
- ctx.sema.to_def(impl_).map_or(false, |def| def.self_ty(ctx.sema.db).as_adt() == Some(adt))
+ ctx.sema.to_def(impl_).is_some_and(|def| {
+ def.self_ty(ctx.sema.db).as_adt() == Some(adt) && def.trait_(ctx.sema.db).is_none()
+ })
});
let (impl_, file) = if let Some(impl_) = cursor_impl {
@@ -3242,4 +3244,82 @@ impl Foo {
",
)
}
+
+ #[test]
+ fn generate_method_skips_trait_impl_for_inherent() {
+ // regression: rust-lang/rust-analyzer#22123
+ check_assist(
+ generate_function,
+ r"
+struct Bar;
+
+impl Bar {
+ fn func1() {}
+}
+
+trait Foo { fn foo(&self); }
+
+impl Foo for Bar {
+ fn foo(&self) {
+ self.func2$0();
+ }
+}
+",
+ r"
+struct Bar;
+
+impl Bar {
+ fn func1() {}
+
+ fn func2(&self) ${0:-> _} {
+ todo!()
+ }
+}
+
+trait Foo { fn foo(&self); }
+
+impl Foo for Bar {
+ fn foo(&self) {
+ self.func2();
+ }
+}
+",
+ )
+ }
+
+ #[test]
+ fn generate_method_from_trait_impl_creates_new_inherent_impl() {
+ // #22123: no inherent impl exists, so the assist must synthesize one
+ // instead of inserting into the trait impl.
+ check_assist(
+ generate_function,
+ r"
+struct Bar;
+
+trait Foo { fn foo(&self); }
+
+impl Foo for Bar {
+ fn foo(&self) {
+ self.func2$0();
+ }
+}
+",
+ r"
+struct Bar;
+impl Bar {
+ fn func2(&self) ${0:-> _} {
+ todo!()
+ }
+}
+
+trait Foo { fn foo(&self); }
+
+impl Foo for Bar {
+ fn foo(&self) {
+ self.func2();
+ }
+}
+",
+ )
+ }
}