Complete extern prelude (again)

4 files changed, 41 insertions, 2 deletions

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 68df083d8..f9da6bc83 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -34,7 +34,7 @@ use crate::{
 /// module, the set of visible items.
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct ItemMap {
-    extern_prelude: FxHashMap<Name, ModuleDef>,
+    pub(crate) extern_prelude: FxHashMap<Name, ModuleDef>,
     per_module: ArenaMap<ModuleId, ModuleScope>,
 }
 
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 6c87d0df7..5ca7bacb5 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -197,7 +197,10 @@ impl Scope {
                     .entries()
                     .for_each(|(name, res)| {
                         f(name.clone(), res.def.map(Resolution::Def));
-                    })
+                    });
+                m.item_map.extern_prelude.iter().for_each(|(name, def)| {
+                    f(name.clone(), PerNs::types(Resolution::Def(*def)));
+                });
             }
             Scope::GenericParams(gp) => {
                 for param in &gp.params {
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 44514ab2b..8674b1e66 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -111,6 +111,20 @@ mod tests {
     }
 
     #[test]
+    fn completes_extern_prelude() {
+        check_reference_completion(
+            "extern_prelude",
+            r"
+            //- /lib.rs
+            use <|>;
+
+            //- /other_crate/lib.rs
+            // nothing here
+            ",
+        );
+    }
+
+    #[test]
     fn completes_module_items_in_nested_modules() {
         check_reference_completion(
             "module_items_in_nested_modules",
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
new file mode 100644
index 000000000..d0e3a6188
--- /dev/null
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
@@ -0,0 +1,22 @@
+---
+created: "2019-02-04T21:08:32.615556587+00:00"
+creator: [email protected]
+expression: kind_completions
+source: crates/ra_ide_api/src/completion/completion_item.rs
+---
+[
+    CompletionItem {
+        completion_kind: Reference,
+        label: "other_crate",
+        kind: Some(
+            Module
+        ),
+        detail: None,
+        documentation: None,
+        lookup: None,
+        insert_text: None,
+        insert_text_format: PlainText,
+        source_range: [4; 4),
+        text_edit: None
+    }
+]