Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include correct item path for variant completions

Browse source
This commit is contained in:
Jonas Schievink 2020-04-24 22:18:59 +02:00
parent 5d97667f8d
commit e131763fb8
1 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
crates/ra_ide/src/completion/complete_unqualified_path.rs
View file

@ -38,7 +38,15 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext) {
if let Some(ty) = ctx.expected_type_of(&ctx.token.parent()) {
if let Some(Adt::Enum(enum_data)) = ty.as_adt() {
let variants = enum_data.variants(ctx.db);
let module = enum_data.module(ctx.db);
let module = if let Some(module) = ctx.scope().module() {
// Compute path from the completion site if available.
module
} else {
// Otherwise fall back to the enum's definition site.
enum_data.module(ctx.db)
};
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,
@ -1308,4 +1316,47 @@ mod tests {
"###
)
}
#[test]
fn completes_enum_variant_from_module() {
assert_debug_snapshot!(
do_reference_completion(
r"
mod m { pub enum E { V } }
fn f() -> m::E {
V<|>
}
"
),
@r###"
[
CompletionItem {
label: "f()",
source_range: [98; 99),
delete: [98; 99),
insert: "f()$0",
kind: Function,
lookup: "f",
detail: "fn f() -> m::E",
},
CompletionItem {
label: "m",
source_range: [98; 99),
delete: [98; 99),
insert: "m",
kind: Module,
},
CompletionItem {
label: "m::E::V",
source_range: [98; 99),
delete: [98; 99),
insert: "m::E::V",
kind: EnumVariant,
detail: "()",
},
]
"###
)
}
}