nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 00:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show completions for enum variant with self prefix if inside impl

Browse Source
This commit is contained in:
Lukas Wirth 2021-02-09 19:04:39 +01:00
parent 12c7b66a7c
commit 2f171ca78d
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/completion/src/completions/unqualified_path.rs
View File

@ -2,7 +2,7 @@
use std::iter;
use hir::{Adt, ModuleDef, ScopeDef, Type};
use hir::{known, Adt, ModuleDef, ScopeDef, Type};
use syntax::AstNode;
use test_utils::mark;
@ -59,6 +59,18 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
enum_data.module(ctx.db)
};
if let Some(impl_) = ctx.impl_def.as_ref().and_then(|impl_| ctx.sema.to_def(impl_)) {
if impl_.target_ty(ctx.db) == *ty {
for &variant in &variants {
let self_path = hir::ModPath::from_segments(
hir::PathKind::Plain,
iter::once(known::SELF_TYPE).chain(iter::once(variant.name(ctx.db))),
);
acc.add_qualified_enum_variant(ctx, variant, self_path.clone());
}
}
}
for variant in variants {
if let Some(path) = module.find_use_path(ctx.db, ModuleDef::from(variant)) {
// Variants with trivial paths are already added by the existing completion logic,
@ -728,6 +740,28 @@ fn f() -> m::E { V$0 }
)
}
#[test]
fn completes_enum_variant_impl() {
check(
r#"
enum Foo { Bar, Baz, Quux }
impl Foo {
fn foo() { let foo: Foo = Q$0 }
}
"#,
expect![[r#"
ev Self::Bar ()
ev Self::Baz ()
ev Self::Quux ()
ev Foo::Bar ()
ev Foo::Baz ()
ev Foo::Quux ()
sp Self
en Foo
"#]],
)
}
#[test]
fn dont_complete_attr() {
check(