Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12199 - jonas-schievink:no-invalid-assoc-ty-completions, r=jonas-schievink

Browse source 
fix: Don't show assoc. type binding completions when invalid

Fixes https://github.com/rust-lang/rust-analyzer/issues/12165
This commit is contained in:
bors 2022-05-09 16:12:47 +00:00
commit ad6df5b12e
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/ide-completion/src/completions/type.rs
View file

@ -165,15 +165,17 @@ pub(crate) fn complete_type_path(acc: &mut Completions, ctx: &CompletionContext)
if let Some(ImmediateLocation::GenericArgList(arg_list)) = &ctx.completion_location {
if let Some(path_seg) = arg_list.syntax().parent().and_then(ast::PathSegment::cast)
{
if let Some(hir::PathResolution::Def(hir::ModuleDef::Trait(trait_))) =
ctx.sema.resolve_path(&path_seg.parent_path())
{
trait_.items_with_supertraits(ctx.sema.db).into_iter().for_each(|it| {
if let hir::AssocItem::TypeAlias(alias) = it {
cov_mark::hit!(complete_assoc_type_in_generics_list);
acc.add_type_alias_with_eq(ctx, alias)
}
});
if path_seg.syntax().ancestors().find_map(ast::TypeBound::cast).is_some() {
if let Some(hir::PathResolution::Def(hir::ModuleDef::Trait(trait_))) =
ctx.sema.resolve_path(&path_seg.parent_path())
{
trait_.items_with_supertraits(ctx.sema.db).into_iter().for_each(|it| {
if let hir::AssocItem::TypeAlias(alias) = it {
cov_mark::hit!(complete_assoc_type_in_generics_list);
acc.add_type_alias_with_eq(ctx, alias)
}
});
}
}
}
}

32
crates/ide-completion/src/tests/type_pos.rs
View file

@ -393,6 +393,38 @@ fn foo<'lt, T: Trait2<self::$0>, const CONST_PARAM: usize>(_: T) {}
);
}
#[test]
fn no_assoc_completion_outside_type_bounds() {
check(
r#"
struct S;
trait Tr<T> {
type Ty;
}
impl Tr<$0
"#,
expect![[r#"
ct CONST
en Enum
ma makro!(…) macro_rules! makro
md module
sp Self
st Record
st S
st Tuple
st Unit
tt Tr
tt Trait
un Union
bt u32
kw crate::
kw self::
kw super::
"#]],
);
}
#[test]
fn enum_qualified() {
check(