aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide_api')
-rw-r--r--crates/ra_ide_api/src/change.rs53
-rw-r--r--crates/ra_ide_api/src/db.rs8
-rw-r--r--crates/ra_ide_api/src/lib.rs3
3 files changed, 46 insertions, 18 deletions
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 147d2b21d..0234c572d 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -1,7 +1,7 @@
1use std::{fmt, sync::Arc, time}; 1use std::{fmt, sync::Arc, time};
2 2
3use ra_db::{ 3use ra_db::{
4 salsa::{Database, SweepStrategy}, 4 salsa::{Database, Durability, SweepStrategy},
5 CrateGraph, FileId, SourceDatabase, SourceRoot, SourceRootId, 5 CrateGraph, FileId, SourceDatabase, SourceRoot, SourceRootId,
6}; 6};
7use ra_prof::{memory_usage, profile, Bytes}; 7use ra_prof::{memory_usage, profile, Bytes};
@@ -155,54 +155,71 @@ impl RootDatabase {
155 log::info!("apply_change {:?}", change); 155 log::info!("apply_change {:?}", change);
156 { 156 {
157 let _p = profile("RootDatabase::apply_change/cancellation"); 157 let _p = profile("RootDatabase::apply_change/cancellation");
158 self.salsa_runtime().next_revision(); 158 self.salsa_runtime().synthetic_write(Durability::LOW);
159 } 159 }
160 if !change.new_roots.is_empty() { 160 if !change.new_roots.is_empty() {
161 let mut local_roots = Vec::clone(&self.local_roots()); 161 let mut local_roots = Vec::clone(&self.local_roots());
162 for (root_id, is_local) in change.new_roots { 162 for (root_id, is_local) in change.new_roots {
163 let root = if is_local { SourceRoot::new() } else { SourceRoot::new_library() }; 163 let root = if is_local { SourceRoot::new() } else { SourceRoot::new_library() };
164 self.set_source_root(root_id, Arc::new(root)); 164 let durability = durability(&root);
165 self.set_source_root_with_durability(root_id, Arc::new(root), durability);
165 if is_local { 166 if is_local {
166 local_roots.push(root_id); 167 local_roots.push(root_id);
167 } 168 }
168 } 169 }
169 self.set_local_roots(Arc::new(local_roots)); 170 self.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH);
170 } 171 }
171 172
172 for (root_id, root_change) in change.roots_changed { 173 for (root_id, root_change) in change.roots_changed {
173 self.apply_root_change(root_id, root_change); 174 self.apply_root_change(root_id, root_change);
174 } 175 }
175 for (file_id, text) in change.files_changed { 176 for (file_id, text) in change.files_changed {
176 self.set_file_text(file_id, text) 177 let source_root_id = self.file_source_root(file_id);
178 let source_root = self.source_root(source_root_id);
179 let durability = durability(&source_root);
180 self.set_file_text_with_durability(file_id, text, durability)
177 } 181 }
178 if !change.libraries_added.is_empty() { 182 if !change.libraries_added.is_empty() {
179 let mut libraries = Vec::clone(&self.library_roots()); 183 let mut libraries = Vec::clone(&self.library_roots());
180 for library in change.libraries_added { 184 for library in change.libraries_added {
181 libraries.push(library.root_id); 185 libraries.push(library.root_id);
182 self.set_source_root(library.root_id, Default::default()); 186 self.set_source_root_with_durability(
183 self.set_constant_library_symbols(library.root_id, Arc::new(library.symbol_index)); 187 library.root_id,
188 Default::default(),
189 Durability::HIGH,
190 );
191 self.set_library_symbols_with_durability(
192 library.root_id,
193 Arc::new(library.symbol_index),
194 Durability::HIGH,
195 );
184 self.apply_root_change(library.root_id, library.root_change); 196 self.apply_root_change(library.root_id, library.root_change);
185 } 197 }
186 self.set_library_roots(Arc::new(libraries)); 198 self.set_library_roots_with_durability(Arc::new(libraries), Durability::HIGH);
187 } 199 }
188 if let Some(crate_graph) = change.crate_graph { 200 if let Some(crate_graph) = change.crate_graph {
189 self.set_crate_graph(Arc::new(crate_graph)) 201 self.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH)
190 } 202 }
191 } 203 }
192 204
193 fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) { 205 fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) {
194 let mut source_root = SourceRoot::clone(&self.source_root(root_id)); 206 let mut source_root = SourceRoot::clone(&self.source_root(root_id));
207 let durability = durability(&source_root);
195 for add_file in root_change.added { 208 for add_file in root_change.added {
196 self.set_file_text(add_file.file_id, add_file.text); 209 self.set_file_text_with_durability(add_file.file_id, add_file.text, durability);
197 self.set_file_relative_path(add_file.file_id, add_file.path.clone()); 210 self.set_file_relative_path_with_durability(
198 self.set_file_source_root(add_file.file_id, root_id); 211 add_file.file_id,
212 add_file.path.clone(),
213 durability,
214 );
215 self.set_file_source_root_with_durability(add_file.file_id, root_id, durability);
199 source_root.files.insert(add_file.path, add_file.file_id); 216 source_root.files.insert(add_file.path, add_file.file_id);
200 } 217 }
201 for remove_file in root_change.removed { 218 for remove_file in root_change.removed {
202 self.set_file_text(remove_file.file_id, Default::default()); 219 self.set_file_text_with_durability(remove_file.file_id, Default::default(), durability);
203 source_root.files.remove(&remove_file.path); 220 source_root.files.remove(&remove_file.path);
204 } 221 }
205 self.set_source_root(root_id, Arc::new(source_root)); 222 self.set_source_root_with_durability(root_id, Arc::new(source_root), durability);
206 } 223 }
207 224
208 pub(crate) fn maybe_collect_garbage(&mut self) { 225 pub(crate) fn maybe_collect_garbage(&mut self) {
@@ -308,3 +325,11 @@ impl RootDatabase {
308 acc 325 acc
309 } 326 }
310} 327}
328
329fn durability(source_root: &SourceRoot) -> Durability {
330 if source_root.is_library {
331 Durability::HIGH
332 } else {
333 Durability::LOW
334 }
335}
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 44216b045..fc8252e4b 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -1,7 +1,7 @@
1use std::{sync::Arc, time}; 1use std::{sync::Arc, time};
2 2
3use ra_db::{ 3use ra_db::{
4 salsa::{self, Database}, 4 salsa::{self, Database, Durability},
5 Canceled, CheckCanceled, FileId, SourceDatabase, 5 Canceled, CheckCanceled, FileId, SourceDatabase,
6}; 6};
7 7
@@ -57,9 +57,9 @@ impl RootDatabase {
57 last_gc: time::Instant::now(), 57 last_gc: time::Instant::now(),
58 last_gc_check: time::Instant::now(), 58 last_gc_check: time::Instant::now(),
59 }; 59 };
60 db.set_crate_graph(Default::default()); 60 db.set_crate_graph_with_durability(Default::default(), Durability::HIGH);
61 db.set_local_roots(Default::default()); 61 db.set_local_roots_with_durability(Default::default(), Durability::HIGH);
62 db.set_library_roots(Default::default()); 62 db.set_library_roots_with_durability(Default::default(), Durability::HIGH);
63 let lru_capacity = lru_capacity.unwrap_or(ra_db::DEFAULT_LRU_CAP); 63 let lru_capacity = lru_capacity.unwrap_or(ra_db::DEFAULT_LRU_CAP);
64 db.query_mut(ra_db::ParseQuery).set_lru_capacity(lru_capacity); 64 db.query_mut(ra_db::ParseQuery).set_lru_capacity(lru_capacity);
65 db.query_mut(hir::db::ParseMacroQuery).set_lru_capacity(lru_capacity); 65 db.query_mut(hir::db::ParseMacroQuery).set_lru_capacity(lru_capacity);
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index edb646c11..fa4ae4379 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -281,6 +281,9 @@ impl AnalysisHost {
281 pub fn raw_database(&self) -> &(impl hir::db::HirDatabase + salsa::Database) { 281 pub fn raw_database(&self) -> &(impl hir::db::HirDatabase + salsa::Database) {
282 &self.db 282 &self.db
283 } 283 }
284 pub fn raw_database_mut(&mut self) -> &mut (impl hir::db::HirDatabase + salsa::Database) {
285 &mut self.db
286 }
284} 287}
285 288
286/// Analysis is a snapshot of a world state at a moment in time. It is the main 289/// Analysis is a snapshot of a world state at a moment in time. It is the main