1 files changed, 90 insertions, 27 deletions

diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 950f89948..5ca870867 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,125 @@ 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),
+        }
+    }
+
+    pub fn set_crate_graph_from_fixture(&mut self, graph: CrateGraphFixture) {
+        let mut ids = FxHashMap::default();
+        let mut crate_graph = CrateGraph::default();
+        for (crate_name, (crate_root, _)) in graph.0.iter() {
+            let crate_root = self.file_id_of(&crate_root);
+            let crate_id = crate_graph.add_crate_root(crate_root);
+            ids.insert(crate_name, crate_id);
+        }
+        for (crate_name, (_, deps)) in graph.0.iter() {
+            let from = ids[crate_name];
+            for dep in deps {
+                let to = ids[dep];
+                crate_graph.add_dep(from, dep.as_str().into(), to).unwrap();
+            }
+        }
+        self.set_crate_graph(Arc::new(crate_graph))
+    }
+
+    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 +153,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 +183,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 +196,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(),
         })
     }
 }
@@ -184,3 +230,20 @@ impl MockDatabase {
             .collect()
     }
 }
+
+#[derive(Default)]
+pub struct CrateGraphFixture(pub FxHashMap<String, (String, Vec<String>)>);
+
+#[macro_export]
+macro_rules! crate_graph {
+    ($($crate_name:literal: ($crate_path:literal, [$($dep:literal),*]),)*) => {{
+        let mut res = $crate::mock::CrateGraphFixture::default();
+        $(
+            res.0.insert(
+                $crate_name.to_string(),
+                ($crate_path.to_string(), vec![$($dep.to_string()),*])
+            );
+        )*
+        res
+    }}
+}