7 files changed, 164 insertions, 13 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 060a46c5e..bad51cc51 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -1,4 +1,4 @@
-use hir::{Ty, AdtDef};
+use hir::{Ty, AdtDef, Docs};
 
 use crate::completion::{CompletionContext, Completions, CompletionItem, CompletionItemKind};
 use crate::completion::completion_item::CompletionKind;
@@ -38,6 +38,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
                             )
                             .kind(CompletionItemKind::Field)
                             .detail(field.ty(ctx.db).subst(substs).to_string())
+                            .set_documentation(field.docs(ctx.db))
                             .add_to(acc);
                         }
                     }
@@ -107,7 +108,10 @@ mod tests {
         check_ref_completion(
             "struct_field_completion_self",
             r"
-            struct A { the_field: (u32,) }
+            struct A {
+                /// This is the_field
+                the_field: (u32,)
+            }
             impl A {
                 fn foo(self) {
                     self.<|>
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index e3f1d42f8..b33ddcde5 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -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)
                 }
             });
@@ -54,6 +66,22 @@ mod tests {
     }
 
     #[test]
+    fn completes_mod_with_docs() {
+        check_reference_completion(
+            "mod_with_docs",
+            r"
+            use self::my<|>;
+
+            /// Some simple
+            /// docs describing `mod my`.
+            mod my {
+                struct Bar;
+            }
+            ",
+        );
+    }
+
+    #[test]
     fn completes_use_item_starting_with_self() {
         check_reference_completion(
             "use_item_starting_with_self",
@@ -116,7 +144,7 @@ mod tests {
     #[test]
     fn completes_enum_variant() {
         check_reference_completion(
-            "reference_completion",
+            "enum_variant",
             "
             //- /lib.rs
             /// An enum
@@ -130,4 +158,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::<|> }
+            ",
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index b2b047766..b16ac2b28 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -215,7 +215,7 @@ impl Builder {
             Some(it) => it,
         };
         let (kind, docs) = match def {
-            hir::ModuleDef::Module(_) => (CompletionItemKind::Module, None),
+            hir::ModuleDef::Module(it) => (CompletionItemKind::Module, it.docs(ctx.db)),
             hir::ModuleDef::Function(func) => return self.from_function(ctx, func),
             hir::ModuleDef::Struct(it) => (CompletionItemKind::Struct, it.docs(ctx.db)),
             hir::ModuleDef::Enum(it) => (CompletionItemKind::Enum, it.docs(ctx.db)),
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
index e46f7807b..8c84439b2 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__reference_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
@@ -1,8 +1,8 @@
 ---
-created: "2019-01-23T23:49:43.278245900+00:00"
-creator: [email protected].1
+created: "2019-01-25T16:44:04.640545300+00:00"
+creator: [email protected].2
 expression: kind_completions
-source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
+source: crates/ra_ide_api/src/completion/completion_item.rs
 ---
 [
     CompletionItem {
@@ -11,7 +11,9 @@ source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
         kind: Some(
             EnumVariant
         ),
-        detail: None,
+        detail: Some(
+            "()"
+        ),
         documentation: Some(
             Documentation(
                 "Foo Variant"
@@ -29,7 +31,9 @@ source: "crates\\ra_ide_api\\src\\completion\\completion_item.rs"
         kind: Some(
             EnumVariant
         ),
-        detail: None,
+        detail: Some(
+            "(i32)"
+        ),
         documentation: Some(
             Documentation(
                 "Bar Variant with i32"
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
new file mode 100644
index 000000000..384634517
--- /dev/null
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
@@ -0,0 +1,64 @@
+---
+created: "2019-01-25T16:44:04.641542400+00:00"
+creator: [email protected]
+expression: kind_completions
+source: crates/ra_ide_api/src/completion/completion_item.rs
+---
+[
+    CompletionItem {
+        completion_kind: Reference,
+        label: "Foo",
+        kind: Some(
+            EnumVariant
+        ),
+        detail: Some(
+            "()"
+        ),
+        documentation: Some(
+            Documentation(
+                "Foo Variant (empty)"
+            )
+        ),
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [180; 180),
+        text_edit: None
+    },
+    CompletionItem {
+        completion_kind: Reference,
+        label: "Bar",
+        kind: Some(
+            EnumVariant
+        ),
+        detail: Some(
+            "(i32, u32)"
+        ),
+        documentation: Some(
+            Documentation(
+                "Bar Variant with i32 and u32"
+            )
+        ),
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [180; 180),
+        text_edit: None
+    },
+    CompletionItem {
+        completion_kind: Reference,
+        label: "S",
+        kind: Some(
+            EnumVariant
+        ),
+        detail: Some(
+            "(S)"
+        ),
+        documentation: None,
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [180; 180),
+        text_edit: None
+    }
+]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
new file mode 100644
index 000000000..3db7119a7
--- /dev/null
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
@@ -0,0 +1,26 @@
+---
+created: "2019-01-25T17:49:28.949186500+00:00"
+creator: [email protected]
+expression: kind_completions
+source: crates/ra_ide_api/src/completion/completion_item.rs
+---
+[
+    CompletionItem {
+        completion_kind: Reference,
+        label: "my",
+        kind: Some(
+            Module
+        ),
+        detail: None,
+        documentation: Some(
+            Documentation(
+                "Some simple\ndocs describing `mod my`."
+            )
+        ),
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [23; 25),
+        text_edit: None
+    }
+]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
index 80e8f3df5..580e92a90 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-01-23T13:19:23.501297515+00:00"
+created: "2019-01-25T19:27:09.519688600+00:00"
 creator: [email protected]
 expression: kind_completions
 source: crates/ra_ide_api/src/completion/completion_item.rs
@@ -14,11 +14,15 @@ source: crates/ra_ide_api/src/completion/completion_item.rs
         detail: Some(
             "(u32,)"
         ),
-        documentation: None,
+        documentation: Some(
+            Documentation(
+                "This is the_field"
+            )
+        ),
         lookup: None,
         insert_text: None,
         insert_text_format: PlainText,
-        source_range: [121; 121),
+        source_range: [187; 187),
         text_edit: None
     },
     CompletionItem {
@@ -36,7 +40,7 @@ source: crates/ra_ide_api/src/completion/completion_item.rs
             "foo()$0"
         ),
         insert_text_format: Snippet,
-        source_range: [121; 121),
+        source_range: [187; 187),
         text_edit: None
     }
 ]