Make extern crates in the root module add to the extern prelude

To accomplish this, separate the extern prelude from the per-module item maps.

2 files changed, 7 insertions, 8 deletions

diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs
index db898a782..7e6e48ae0 100644
--- a/crates/ra_hir/src/nameres/lower.rs
+++ b/crates/ra_hir/src/nameres/lower.rs
@@ -23,6 +23,7 @@ pub(super) struct ImportData {
     pub(super) path: Path,
     pub(super) alias: Option<Name>,
     pub(super) is_glob: bool,
+    pub(super) is_extern_crate: bool,
 }
 
 /// A set of items and imports declared inside a module, without relation to
@@ -199,6 +200,7 @@ impl LoweredModule {
                         path,
                         alias,
                         is_glob: false,
+                        is_extern_crate: true,
                     });
                 }
             }
@@ -228,6 +230,7 @@ impl LoweredModule {
                 path,
                 alias,
                 is_glob: segment.is_none(),
+                is_extern_crate: false,
             });
             if let Some(segment) = segment {
                 source_map.insert(import, segment)
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 42c59f76f..0654dbaa1 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -329,7 +329,6 @@ fn item_map_across_crates() {
         module.module_id,
         "
             Baz: t v
-            test_crate: t
         ",
     );
 }
@@ -342,7 +341,9 @@ fn extern_crate_rename() {
         extern crate alloc as alloc_crate;
 
         mod alloc;
+        mod sync;
 
+        //- /sync.rs
         use alloc_crate::Arc;
 
         //- /lib.rs
@@ -350,6 +351,7 @@ fn extern_crate_rename() {
     ",
     );
     let main_id = sr.files[RelativePath::new("/main.rs")];
+    let sync_id = sr.files[RelativePath::new("/sync.rs")];
     let lib_id = sr.files[RelativePath::new("/lib.rs")];
 
     let mut crate_graph = CrateGraph::default();
@@ -361,7 +363,7 @@ fn extern_crate_rename() {
 
     db.set_crate_graph(Arc::new(crate_graph));
 
-    let module = crate::source_binder::module_from_file_id(&db, main_id).unwrap();
+    let module = crate::source_binder::module_from_file_id(&db, sync_id).unwrap();
     let krate = module.krate(&db).unwrap();
     let item_map = db.item_map(krate);
 
@@ -370,8 +372,6 @@ fn extern_crate_rename() {
         module.module_id,
         "
             Arc: t v
-            alloc: t
-            alloc_crate: t
         ",
     );
 }
@@ -403,8 +403,6 @@ fn import_across_source_roots() {
 
     let main_id = sr2.files[RelativePath::new("/main.rs")];
 
-    eprintln!("lib = {:?}, main = {:?}", lib_id, main_id);
-
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
     let lib_crate = crate_graph.add_crate_root(lib_id);
@@ -423,7 +421,6 @@ fn import_across_source_roots() {
         module.module_id,
         "
             C: t v
-            test_crate: t
         ",
     );
 }
@@ -465,7 +462,6 @@ fn reexport_across_crates() {
         module.module_id,
         "
             Baz: t v
-            test_crate: t
         ",
     );
 }