2 files changed, 75 insertions, 55 deletions

diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 950f89948..29b696afa 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -6,6 +6,7 @@ use ra_db::{
 };
 use relative_path::RelativePathBuf;
 use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
+use rustc_hash::FxHashMap;
 
 use crate::{db, HirInterner};
 
@@ -21,82 +22,107 @@ pub struct MockDatabase {
     events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,
     runtime: salsa::Runtime<MockDatabase>,
     interner: Arc<HirInterner>,
-    file_counter: u32,
+    files: FxHashMap<String, FileId>,
 }
 
 impl panic::RefUnwindSafe for MockDatabase {}
 
 impl MockDatabase {
-    pub fn with_files(fixture: &str) -> (MockDatabase, SourceRoot) {
-        let (db, source_root, position) = MockDatabase::from_fixture(fixture);
+    pub fn with_files(fixture: &str) -> MockDatabase {
+        let (db, position) = MockDatabase::from_fixture(fixture);
         assert!(position.is_none());
-        (db, source_root)
+        db
     }
 
     pub fn with_single_file(text: &str) -> (MockDatabase, SourceRoot, FileId) {
         let mut db = MockDatabase::default();
         let mut source_root = SourceRoot::default();
-        let file_id = db.add_file(WORKSPACE, &mut source_root, "/main.rs", text);
+        let file_id = db.add_file(WORKSPACE, "/", &mut source_root, "/main.rs", text);
         db.set_source_root(WORKSPACE, Arc::new(source_root.clone()));
         (db, source_root, file_id)
     }
 
     pub fn with_position(fixture: &str) -> (MockDatabase, FilePosition) {
-        let (db, _, position) = MockDatabase::from_fixture(fixture);
+        let (db, position) = MockDatabase::from_fixture(fixture);
         let position = position.expect("expected a marker ( <|> )");
         (db, position)
     }
 
-    fn from_fixture(fixture: &str) -> (MockDatabase, SourceRoot, Option<FilePosition>) {
+    pub fn file_id_of(&self, path: &str) -> FileId {
+        match self.files.get(path) {
+            Some(it) => *it,
+            None => panic!("unknown file: {:?}\nexisting files:\n{:#?}", path, self.files),
+        }
+    }
+
+    fn from_fixture(fixture: &str) -> (MockDatabase, Option<FilePosition>) {
         let mut db = MockDatabase::default();
 
-        let (source_root, pos) = db.add_fixture(WORKSPACE, fixture);
+        let pos = db.add_fixture(fixture);
 
-        (db, source_root, pos)
+        (db, pos)
     }
 
-    pub fn add_fixture(
-        &mut self,
-        source_root_id: SourceRootId,
-        fixture: &str,
-    ) -> (SourceRoot, Option<FilePosition>) {
+    fn add_fixture(&mut self, fixture: &str) -> Option<FilePosition> {
         let mut position = None;
         let mut source_root = SourceRoot::default();
+        let mut source_root_id = WORKSPACE;
+        let mut source_root_prefix = "/".to_string();
         for entry in parse_fixture(fixture) {
+            if entry.meta.starts_with("root") {
+                self.set_source_root(source_root_id, Arc::new(source_root));
+                source_root = SourceRoot::default();
+
+                source_root_id = SourceRootId(source_root_id.0 + 1);
+                source_root_prefix = entry.meta["root".len()..].trim().to_string();
+                continue;
+            }
             if entry.text.contains(CURSOR_MARKER) {
                 assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
                 position = Some(self.add_file_with_position(
                     source_root_id,
+                    &source_root_prefix,
                     &mut source_root,
                     &entry.meta,
                     &entry.text,
                 ));
             } else {
-                self.add_file(source_root_id, &mut source_root, &entry.meta, &entry.text);
+                self.add_file(
+                    source_root_id,
+                    &source_root_prefix,
+                    &mut source_root,
+                    &entry.meta,
+                    &entry.text,
+                );
             }
         }
-        self.set_source_root(source_root_id, Arc::new(source_root.clone()));
-        (source_root, position)
+        self.set_source_root(source_root_id, Arc::new(source_root));
+        position
     }
 
     fn add_file(
         &mut self,
         source_root_id: SourceRootId,
+        source_root_prefix: &str,
         source_root: &mut SourceRoot,
         path: &str,
         text: &str,
     ) -> FileId {
-        assert!(path.starts_with('/'));
-        let is_crate_root = path == "/lib.rs" || path == "/main.rs";
+        assert!(source_root_prefix.starts_with('/'));
+        assert!(source_root_prefix.ends_with('/'));
+        assert!(path.starts_with(source_root_prefix));
+        let rel_path = RelativePathBuf::from_path(&path[source_root_prefix.len()..]).unwrap();
+
+        let is_crate_root = rel_path == "lib.rs" || rel_path == "/main.rs";
 
-        let path = RelativePathBuf::from_path(&path[1..]).unwrap();
-        let file_id = FileId(self.file_counter);
-        self.file_counter += 1;
+        let file_id = FileId(self.files.len() as u32);
+        let prev = self.files.insert(path.to_string(), file_id);
+        assert!(prev.is_none(), "duplicate files in the text fixture");
         let text = Arc::new(text.to_string());
         self.set_file_text(file_id, text);
-        self.set_file_relative_path(file_id, path.clone());
+        self.set_file_relative_path(file_id, rel_path.clone());
         self.set_file_source_root(file_id, source_root_id);
-        source_root.files.insert(path, file_id);
+        source_root.files.insert(rel_path, file_id);
 
         if is_crate_root {
             let mut crate_graph = CrateGraph::default();
@@ -109,12 +135,13 @@ impl MockDatabase {
     fn add_file_with_position(
         &mut self,
         source_root_id: SourceRootId,
+        source_root_prefix: &str,
         source_root: &mut SourceRoot,
         path: &str,
         text: &str,
     ) -> FilePosition {
         let (offset, text) = extract_offset(text);
-        let file_id = self.add_file(source_root_id, source_root, path, &text);
+        let file_id = self.add_file(source_root_id, source_root_prefix, source_root, path, &text);
         FilePosition { file_id, offset }
     }
 }
@@ -138,7 +165,7 @@ impl Default for MockDatabase {
             events: Default::default(),
             runtime: salsa::Runtime::default(),
             interner: Default::default(),
-            file_counter: 0,
+            files: FxHashMap::default(),
         };
         db.set_crate_graph(Default::default());
         db
@@ -151,7 +178,8 @@ impl salsa::ParallelDatabase for MockDatabase {
             events: Default::default(),
             runtime: self.runtime.snapshot(self),
             interner: Arc::clone(&self.interner),
-            file_counter: self.file_counter,
+            // only the root database can be used to get file_id by path.
+            files: FxHashMap::default(),
         })
     }
 }
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 9c0e4ef29..905c3accf 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
-use ra_db::{CrateGraph, SourceRootId, SourceDatabase};
-use relative_path::RelativePath;
+use ra_db::{CrateGraph, SourceDatabase};
 use test_utils::{assert_eq_text, covers};
 
 use crate::{
@@ -252,7 +251,7 @@ fn glob_enum() {
 #[test]
 fn glob_across_crates() {
     covers!(glob_across_crates);
-    let (mut db, sr) = MockDatabase::with_files(
+    let mut db = MockDatabase::with_files(
         "
         //- /main.rs
         use test_crate::*;
@@ -261,8 +260,8 @@ fn glob_across_crates() {
         pub struct Baz;
     ",
     );
-    let main_id = sr.files[RelativePath::new("/main.rs")];
-    let lib_id = sr.files[RelativePath::new("/lib.rs")];
+    let main_id = db.file_id_of("/main.rs");
+    let lib_id = db.file_id_of("/lib.rs");
 
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
@@ -411,7 +410,7 @@ fn item_map_enum_importing() {
 
 #[test]
 fn item_map_across_crates() {
-    let (mut db, sr) = MockDatabase::with_files(
+    let mut db = MockDatabase::with_files(
         "
         //- /main.rs
         use test_crate::Baz;
@@ -420,8 +419,8 @@ fn item_map_across_crates() {
         pub struct Baz;
     ",
     );
-    let main_id = sr.files[RelativePath::new("/main.rs")];
-    let lib_id = sr.files[RelativePath::new("/lib.rs")];
+    let main_id = db.file_id_of("/main.rs");
+    let lib_id = db.file_id_of("/lib.rs");
 
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
@@ -445,7 +444,7 @@ fn item_map_across_crates() {
 
 #[test]
 fn extern_crate_rename() {
-    let (mut db, sr) = MockDatabase::with_files(
+    let mut db = MockDatabase::with_files(
         "
         //- /main.rs
         extern crate alloc as alloc_crate;
@@ -460,9 +459,9 @@ fn extern_crate_rename() {
         struct Arc;
     ",
     );
-    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 main_id = db.file_id_of("/main.rs");
+    let sync_id = db.file_id_of("/sync.rs");
+    let lib_id = db.file_id_of("/lib.rs");
 
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
@@ -486,7 +485,7 @@ fn extern_crate_rename() {
 
 #[test]
 fn import_across_source_roots() {
-    let (mut db, sr) = MockDatabase::with_files(
+    let mut db = MockDatabase::with_files(
         "
         //- /lib.rs
         pub mod a {
@@ -494,22 +493,15 @@ fn import_across_source_roots() {
                 pub struct C;
             }
         }
-    ",
-    );
-    let lib_id = sr.files[RelativePath::new("/lib.rs")];
 
-    let source_root = SourceRootId(1);
+        //- root /test_crate/
 
-    let (sr2, pos) = db.add_fixture(
-        source_root,
-        "
-        //- /main.rs
+        //- /test_crate/main.rs
         use test_crate::a::b::C;
-    ",
+        ",
     );
-    assert!(pos.is_none());
-
-    let main_id = sr2.files[RelativePath::new("/main.rs")];
+    let lib_id = db.file_id_of("/lib.rs");
+    let main_id = db.file_id_of("/test_crate/main.rs");
 
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
@@ -533,7 +525,7 @@ fn import_across_source_roots() {
 
 #[test]
 fn reexport_across_crates() {
-    let (mut db, sr) = MockDatabase::with_files(
+    let mut db = MockDatabase::with_files(
         "
         //- /main.rs
         use test_crate::Baz;
@@ -547,8 +539,8 @@ fn reexport_across_crates() {
         pub struct Baz;
     ",
     );
-    let main_id = sr.files[RelativePath::new("/main.rs")];
-    let lib_id = sr.files[RelativePath::new("/lib.rs")];
+    let main_id = db.file_id_of("/main.rs");
+    let lib_id = db.file_id_of("/lib.rs");
 
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);