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

EnumVariant details for completion

Browse source
This commit is contained in:
Jeremy A. Kolb 2019-01-25 11:50:59 -05:00
parent 6df1f71b7d
commit 9a97c10fda
5 changed files with 109 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
use join_to_string::join;
use crate::{
completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext},
};
@ -29,6 +31,15 @@ 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(),
@ -36,6 +47,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
)
.kind(CompletionItemKind::EnumVariant)
.set_documentation(variant.docs(ctx.db))
.set_detail(Some(detail))
.add_to(acc)
}
});
@ -116,7 +128,7 @@ mod tests {
#[test]
fn completes_enum_variant() {
check_reference_completion(
"reference_completion",
"enum_variant",
"
//- /lib.rs
/// An enum
@ -130,4 +142,25 @@ mod tests {
",
);
}
#[test]
fn completes_enum_variant_with_details() {
check_reference_completion(
"enum_variant_with_details",
"
//- /lib.rs
struct S { field: u32 }
/// An enum
enum E {
/// Foo Variant (empty)
Foo,
/// Bar Variant with i32 and u32
Bar(i32, u32),
///
S(S),
}
fn foo() { let _ = E::<|> }
",
);
}
}