4 files changed, 120 insertions, 2 deletions

diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_path.rs
index d588ee364..3db17f15f 100644
--- a/crates/ra_ide/src/completion/complete_path.rs
+++ b/crates/ra_ide/src/completion/complete_path.rs
@@ -967,4 +967,74 @@ mod tests {
         ]
         "###);
     }
+
+    #[test]
+    fn function_mod_share_name() {
+        assert_debug_snapshot!(
+        do_reference_completion(
+                r"
+                fn foo() {
+                    self::m::<|>
+                }
+
+                mod m {
+                    pub mod z {}
+                    pub fn z() {}
+                }
+                ",
+        ),
+            @r###"
+        [
+            CompletionItem {
+                label: "z",
+                source_range: [57; 57),
+                delete: [57; 57),
+                insert: "z",
+                kind: Module,
+            },
+            CompletionItem {
+                label: "z()",
+                source_range: [57; 57),
+                delete: [57; 57),
+                insert: "z()$0",
+                kind: Function,
+                lookup: "z",
+                detail: "pub fn z()",
+            },
+        ]
+        "###
+        );
+    }
+
+    #[test]
+    fn completes_hashmap_new() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                struct RandomState;
+                struct HashMap<K, V, S = RandomState> {}
+
+                impl<K, V> HashMap<K, V, RandomState> {
+                    pub fn new() -> HashMap<K, V, RandomState> { }
+                }
+                fn foo() {
+                    HashMap::<|>
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "new()",
+                source_range: [292; 292),
+                delete: [292; 292),
+                insert: "new()$0",
+                kind: Function,
+                lookup: "new",
+                detail: "pub fn new() -> HashMap<K, V, RandomState>",
+            },
+        ]
+        "###
+        );
+    }
 }
diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_scope.rs
index bd4adf23a..5ffff5a1c 100644
--- a/crates/ra_ide/src/completion/complete_scope.rs
+++ b/crates/ra_ide/src/completion/complete_scope.rs
@@ -42,6 +42,7 @@ mod tests {
                 kind: Function,
                 lookup: "quux",
                 detail: "fn quux(x: i32)",
+                trigger_call_info: true,
             },
             CompletionItem {
                 label: "x",
@@ -844,6 +845,7 @@ mod tests {
                 kind: Function,
                 lookup: "quux",
                 detail: "fn quux(x: i32)",
+                trigger_call_info: true,
             },
             CompletionItem {
                 label: "x",
@@ -865,4 +867,38 @@ mod tests {
         "###
         );
     }
+
+    #[test]
+    fn completes_unresolved_uses() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                use spam::Quux;
+
+                fn main() {
+                    <|>
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Quux",
+                source_range: [82; 82),
+                delete: [82; 82),
+                insert: "Quux",
+            },
+            CompletionItem {
+                label: "main()",
+                source_range: [82; 82),
+                delete: [82; 82),
+                insert: "main()$0",
+                kind: Function,
+                lookup: "main",
+                detail: "fn main()",
+            },
+        ]
+        "###
+        );
+    }
 }
diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs
index ef0eb43b2..bc0f1aff5 100644
--- a/crates/ra_ide/src/completion/completion_item.rs
+++ b/crates/ra_ide/src/completion/completion_item.rs
@@ -80,6 +80,9 @@ impl fmt::Debug for CompletionItem {
         if self.deprecated {
             s.field("deprecated", &true);
         }
+        if self.trigger_call_info {
+            s.field("trigger_call_info", &true);
+        }
         s.finish()
     }
 }
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 5213def20..910844244 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -273,8 +273,10 @@ impl Completions {
     pub(crate) fn add_enum_variant(&mut self, ctx: &CompletionContext, variant: hir::EnumVariant) {
         let is_deprecated = is_deprecated(variant, ctx.db);
         let name = variant.name(ctx.db);
-        let detail_types =
-            variant.fields(ctx.db).into_iter().map(|field| (field.name(ctx.db), field.ty(ctx.db)));
+        let detail_types = variant
+            .fields(ctx.db)
+            .into_iter()
+            .map(|field| (field.name(ctx.db), field.signature_ty(ctx.db)));
         let detail = match variant.kind(ctx.db) {
             StructKind::Tuple | StructKind::Unit => {
                 join(detail_types.map(|(_, t)| t.display(ctx.db).to_string()))
@@ -510,6 +512,7 @@ mod tests {
                 kind: Function,
                 lookup: "with_args",
                 detail: "fn with_args(x: i32, y: String)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -566,6 +569,7 @@ mod tests {
                 kind: Method,
                 lookup: "foo",
                 detail: "fn foo(&self, x: i32)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -600,6 +604,7 @@ mod tests {
                 kind: Method,
                 lookup: "foo",
                 detail: "fn foo(&self, x: i32)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -718,6 +723,7 @@ mod tests {
                 kind: Function,
                 lookup: "foo",
                 detail: "fn foo(xs: Ve)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -747,6 +753,7 @@ mod tests {
                 kind: Function,
                 lookup: "foo",
                 detail: "fn foo(xs: Ve)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -775,6 +782,7 @@ mod tests {
                 kind: Function,
                 lookup: "foo",
                 detail: "fn foo(xs: Ve)",
+                trigger_call_info: true,
             },
         ]
         "###
@@ -803,6 +811,7 @@ mod tests {
                 kind: Function,
                 lookup: "foo",
                 detail: "fn foo(xs: Ve<i128>)",
+                trigger_call_info: true,
             },
         ]
         "###