mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-28 11:20:54 +00:00
fix: Don't complete Drop::drop for qualified paths
This commit is contained in:
parent
e55ed52003
commit
9b046d1051
@ -1,6 +1,7 @@
|
|||||||
//! Completion of paths, i.e. `some::prefix::$0`.
|
//! Completion of paths, i.e. `some::prefix::$0`.
|
||||||
|
|
||||||
use hir::{ScopeDef, Trait};
|
use hir::{ScopeDef, Trait};
|
||||||
|
use ide_db::famous_defs::FamousDefs;
|
||||||
use rustc_hash::FxHashSet;
|
use rustc_hash::FxHashSet;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
||||||
@ -23,6 +24,13 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
|
|||||||
Some(PathCompletionCtx { qualifier: Some(ref qualifier), kind, .. }) => (qualifier, kind),
|
Some(PathCompletionCtx { qualifier: Some(ref qualifier), kind, .. }) => (qualifier, kind),
|
||||||
_ => return,
|
_ => return,
|
||||||
};
|
};
|
||||||
|
let traits_in_scope = |ctx: &CompletionContext| {
|
||||||
|
let mut traits_in_scope = ctx.scope.visible_traits();
|
||||||
|
if let Some(drop) = FamousDefs(&ctx.sema, ctx.krate).core_ops_Drop() {
|
||||||
|
traits_in_scope.remove(&drop.into());
|
||||||
|
}
|
||||||
|
traits_in_scope
|
||||||
|
};
|
||||||
|
|
||||||
// special case `<_>::$0` as this doesn't resolve to anything.
|
// special case `<_>::$0` as this doesn't resolve to anything.
|
||||||
if qualifier.path.qualifier().is_none() {
|
if qualifier.path.qualifier().is_none() {
|
||||||
@ -34,8 +42,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
|
|||||||
})
|
})
|
||||||
) {
|
) {
|
||||||
cov_mark::hit!(completion_type_anchor_empty);
|
cov_mark::hit!(completion_type_anchor_empty);
|
||||||
ctx.scope
|
traits_in_scope(ctx)
|
||||||
.visible_traits()
|
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.flat_map(|it| Trait::from(it).items(ctx.sema.db))
|
.flat_map(|it| Trait::from(it).items(ctx.sema.db))
|
||||||
.for_each(|item| add_assoc_item(acc, ctx, item));
|
.for_each(|item| add_assoc_item(acc, ctx, item));
|
||||||
@ -141,7 +148,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
|
|||||||
|
|
||||||
let krate = ctx.krate;
|
let krate = ctx.krate;
|
||||||
if let Some(krate) = krate {
|
if let Some(krate) = krate {
|
||||||
let traits_in_scope = ctx.scope.visible_traits();
|
let traits_in_scope = traits_in_scope(ctx);
|
||||||
ty.iterate_path_candidates(
|
ty.iterate_path_candidates(
|
||||||
ctx.db,
|
ctx.db,
|
||||||
&ctx.scope,
|
&ctx.scope,
|
||||||
@ -179,8 +186,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
|
|||||||
if let Some(hir::Adt::Enum(e)) = ty.as_adt() {
|
if let Some(hir::Adt::Enum(e)) = ty.as_adt() {
|
||||||
add_enum_variants(acc, ctx, e);
|
add_enum_variants(acc, ctx, e);
|
||||||
}
|
}
|
||||||
|
let traits_in_scope = traits_in_scope(ctx);
|
||||||
let traits_in_scope = ctx.scope.visible_traits();
|
|
||||||
let mut seen = FxHashSet::default();
|
let mut seen = FxHashSet::default();
|
||||||
ty.iterate_path_candidates(
|
ty.iterate_path_candidates(
|
||||||
ctx.db,
|
ctx.db,
|
||||||
|
@ -553,6 +553,23 @@ fn func() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ty_qualified_no_drop() {
|
||||||
|
check_empty(
|
||||||
|
r#"
|
||||||
|
//- minicore: drop
|
||||||
|
struct Foo;
|
||||||
|
impl Drop for Foo {
|
||||||
|
fn drop(&mut self) {}
|
||||||
|
}
|
||||||
|
fn func() {
|
||||||
|
Foo::$0
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
expect![[r#""#]],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn with_parens() {
|
fn with_parens() {
|
||||||
check_empty(
|
check_empty(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user