Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22291 from ChayimFriedman2/missing-type-default
fix: In "Implement missing members", do not add assoc types with defaults
| -rw-r--r-- | crates/ide-assists/src/handlers/add_missing_impl_members.rs | 18 | ||||
| -rw-r--r-- | crates/ide-assists/src/utils.rs | 6 | ||||
| -rw-r--r-- | crates/ide-db/src/traits.rs | 24 |
3 files changed, 33 insertions, 15 deletions
diff --git a/crates/ide-assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs index 20f27dc728..efbe3817e1 100644 --- a/crates/ide-assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs @@ -2623,4 +2623,22 @@ impl Allocator for System { "#, ); } + + #[test] + fn does_not_include_defaulted_assoc_types() { + check_assist_not_applicable( + add_missing_impl_members, + r#" +trait Trait { + type NotRequired = (); +} + +struct Struct; + +impl Trait for Struct { + $0 +} + "#, + ); + } } diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs index 7251b0e1ff..7cd2f4c3fd 100644 --- a/crates/ide-assists/src/utils.rs +++ b/crates/ide-assists/src/utils.rs @@ -183,7 +183,11 @@ pub fn filter_assoc_items( (default_methods, def.body()), (DefaultMethods::Only, Some(_)) | (DefaultMethods::No, None) ), - _ => default_methods == DefaultMethods::No, + ast::AssocItem::TypeAlias(def) => matches!( + (default_methods, def.ty()), + (DefaultMethods::Only, Some(_)) | (DefaultMethods::No, None) + ), + ast::AssocItem::MacroCall(_) => unreachable!(), }) .collect(); diff --git a/crates/ide-db/src/traits.rs b/crates/ide-db/src/traits.rs index 60bdc2d82c..d38d9b6708 100644 --- a/crates/ide-db/src/traits.rs +++ b/crates/ide-db/src/traits.rs @@ -34,38 +34,33 @@ pub fn get_missing_assoc_items( // may share the same name as a function or constant. let mut impl_fns_consts = FxHashSet::default(); let mut impl_type = FxHashSet::default(); - let edition = imp.module(sema.db).krate(sema.db).edition(sema.db); for item in imp.items(sema.db) { match item { hir::AssocItem::Function(it) => { - impl_fns_consts.insert(it.name(sema.db).display(sema.db, edition).to_string()); + impl_fns_consts.insert(it.name(sema.db)); } hir::AssocItem::Const(it) => { if let Some(name) = it.name(sema.db) { - impl_fns_consts.insert(name.display(sema.db, edition).to_string()); + impl_fns_consts.insert(name); } } hir::AssocItem::TypeAlias(it) => { - impl_type.insert(it.name(sema.db).display(sema.db, edition).to_string()); + impl_type.insert(it.name(sema.db)); } } } - resolve_target_trait(sema, impl_def).map_or(vec![], |target_trait| { + imp.trait_(sema.db).map_or(vec![], |target_trait| { target_trait .items(sema.db) .into_iter() .filter(|i| match i { - hir::AssocItem::Function(f) => !impl_fns_consts - .contains(&f.name(sema.db).display(sema.db, edition).to_string()), - hir::AssocItem::TypeAlias(t) => { - !impl_type.contains(&t.name(sema.db).display(sema.db, edition).to_string()) + hir::AssocItem::Function(f) => !impl_fns_consts.contains(&f.name(sema.db)), + hir::AssocItem::TypeAlias(t) => !impl_type.contains(&t.name(sema.db)), + hir::AssocItem::Const(c) => { + c.name(sema.db).map(|n| !impl_fns_consts.contains(&n)).unwrap_or_default() } - hir::AssocItem::Const(c) => c - .name(sema.db) - .map(|n| !impl_fns_consts.contains(&n.display(sema.db, edition).to_string())) - .unwrap_or_default(), }) .collect() }) @@ -158,7 +153,8 @@ mod tests { let file = sema.parse(position.file_id); let impl_block: ast::Impl = sema.find_node_at_offset_with_descend(file.syntax(), position.offset).unwrap(); - let items = crate::traits::get_missing_assoc_items(&sema, &impl_block); + let items = + hir::attach_db(&db, || crate::traits::get_missing_assoc_items(&sema, &impl_block)); let actual = items .into_iter() .map(|item| item.name(&db).unwrap().display(&db, Edition::CURRENT).to_string()) |