language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

move enum-variants to presentation

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-24 20:56:19 +03:00
parent 9af525dbd6
commit 5887c0e574
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/ra_ide_api/src/completion/complete_path.rs
View file

@ -1,9 +1,8 @@
use join_to_string::join;
use hir::{Docs, Resolution};
use hir::{Resolution};
use ra_syntax::{AstNode, ast::NameOwner};
use test_utils::tested_by;
use crate::completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext};
use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionContext};
pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
let path = match &ctx.path_prefix {
@ -39,24 +38,9 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
}
}
hir::ModuleDef::Enum(e) => {
e.variants(ctx.db).into_iter().for_each(|variant| {
if let Some(name) = variant.name(ctx.db) {
let detail_types =
variant.fields(ctx.db).into_iter().map(|field| field.ty(ctx.db));
let detail =
join(detail_types).separator(", ").surround_with("(", ")").to_string();
CompletionItem::new(
CompletionKind::Reference,
ctx.source_range(),
name.to_string(),
)
.kind(CompletionItemKind::EnumVariant)
.set_documentation(variant.docs(ctx.db))
.set_detail(Some(detail))
.add_to(acc)
}
});
for variant in e.variants(ctx.db) {
acc.add_enum_variant(ctx, variant);
}
}
hir::ModuleDef::Struct(s) => {
let ty = s.ty(ctx.db);