diff options
Diffstat (limited to 'crates/ra_hir/src/mock.rs')
-rw-r--r-- | crates/ra_hir/src/mock.rs | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index aa54336b8..36b174cd6 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs | |||
@@ -2,8 +2,7 @@ use std::{sync::Arc, panic}; | |||
2 | 2 | ||
3 | use parking_lot::Mutex; | 3 | use parking_lot::Mutex; |
4 | use ra_db::{ | 4 | use ra_db::{ |
5 | BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, | 5 | BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, |
6 | salsa::{self, Database}, | ||
7 | }; | 6 | }; |
8 | use relative_path::RelativePathBuf; | 7 | use relative_path::RelativePathBuf; |
9 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; | 8 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; |
@@ -34,8 +33,7 @@ impl MockDatabase { | |||
34 | let mut db = MockDatabase::default(); | 33 | let mut db = MockDatabase::default(); |
35 | let mut source_root = SourceRoot::default(); | 34 | let mut source_root = SourceRoot::default(); |
36 | let file_id = db.add_file(WORKSPACE, &mut source_root, "/main.rs", text); | 35 | let file_id = db.add_file(WORKSPACE, &mut source_root, "/main.rs", text); |
37 | db.query_mut(ra_db::SourceRootQuery) | 36 | db.set_source_root(WORKSPACE, Arc::new(source_root.clone())); |
38 | .set(WORKSPACE, Arc::new(source_root.clone())); | ||
39 | (db, source_root, file_id) | 37 | (db, source_root, file_id) |
40 | } | 38 | } |
41 | 39 | ||
@@ -45,11 +43,6 @@ impl MockDatabase { | |||
45 | (db, position) | 43 | (db, position) |
46 | } | 44 | } |
47 | 45 | ||
48 | pub(crate) fn set_crate_graph(&mut self, crate_graph: CrateGraph) { | ||
49 | self.query_mut(ra_db::CrateGraphQuery) | ||
50 | .set((), Arc::new(crate_graph)); | ||
51 | } | ||
52 | |||
53 | fn from_fixture(fixture: &str) -> (MockDatabase, SourceRoot, Option<FilePosition>) { | 46 | fn from_fixture(fixture: &str) -> (MockDatabase, SourceRoot, Option<FilePosition>) { |
54 | let mut db = MockDatabase::default(); | 47 | let mut db = MockDatabase::default(); |
55 | 48 | ||
@@ -81,8 +74,7 @@ impl MockDatabase { | |||
81 | self.add_file(source_root_id, &mut source_root, &entry.meta, &entry.text); | 74 | self.add_file(source_root_id, &mut source_root, &entry.meta, &entry.text); |
82 | } | 75 | } |
83 | } | 76 | } |
84 | self.query_mut(ra_db::SourceRootQuery) | 77 | self.set_source_root(source_root_id, Arc::new(source_root.clone())); |
85 | .set(source_root_id, Arc::new(source_root.clone())); | ||
86 | (source_root, position) | 78 | (source_root, position) |
87 | } | 79 | } |
88 | 80 | ||
@@ -100,17 +92,15 @@ impl MockDatabase { | |||
100 | let file_id = FileId(self.file_counter); | 92 | let file_id = FileId(self.file_counter); |
101 | self.file_counter += 1; | 93 | self.file_counter += 1; |
102 | let text = Arc::new(text.to_string()); | 94 | let text = Arc::new(text.to_string()); |
103 | self.query_mut(ra_db::FileTextQuery).set(file_id, text); | 95 | self.set_file_text(file_id, text); |
104 | self.query_mut(ra_db::FileRelativePathQuery) | 96 | self.set_file_relative_path(file_id, path.clone()); |
105 | .set(file_id, path.clone()); | 97 | self.set_file_source_root(file_id, source_root_id); |
106 | self.query_mut(ra_db::FileSourceRootQuery) | ||
107 | .set(file_id, source_root_id); | ||
108 | source_root.files.insert(path, file_id); | 98 | source_root.files.insert(path, file_id); |
109 | 99 | ||
110 | if is_crate_root { | 100 | if is_crate_root { |
111 | let mut crate_graph = CrateGraph::default(); | 101 | let mut crate_graph = CrateGraph::default(); |
112 | crate_graph.add_crate_root(file_id); | 102 | crate_graph.add_crate_root(file_id); |
113 | self.set_crate_graph(crate_graph); | 103 | self.set_crate_graph(Arc::new(crate_graph)); |
114 | } | 104 | } |
115 | file_id | 105 | file_id |
116 | } | 106 | } |
@@ -149,12 +139,9 @@ impl Default for MockDatabase { | |||
149 | interner: Default::default(), | 139 | interner: Default::default(), |
150 | file_counter: 0, | 140 | file_counter: 0, |
151 | }; | 141 | }; |
152 | db.query_mut(ra_db::CrateGraphQuery) | 142 | db.set_crate_graph(Default::default()); |
153 | .set((), Default::default()); | 143 | db.set_local_roots(Default::default()); |
154 | db.query_mut(ra_db::LocalRootsQuery) | 144 | db.set_library_roots(Default::default()); |
155 | .set((), Default::default()); | ||
156 | db.query_mut(ra_db::LibraryRootsQuery) | ||
157 | .set((), Default::default()); | ||
158 | db | 145 | db |
159 | } | 146 | } |
160 | } | 147 | } |