diff options
Diffstat (limited to 'crates/ra_ide_db/src/change.rs')
-rw-r--r-- | crates/ra_ide_db/src/change.rs | 86 |
1 files changed, 5 insertions, 81 deletions
diff --git a/crates/ra_ide_db/src/change.rs b/crates/ra_ide_db/src/change.rs index 5dbe1c1b7..78ee6a515 100644 --- a/crates/ra_ide_db/src/change.rs +++ b/crates/ra_ide_db/src/change.rs | |||
@@ -9,24 +9,16 @@ use ra_db::{ | |||
9 | SourceRootId, | 9 | SourceRootId, |
10 | }; | 10 | }; |
11 | use ra_prof::{memory_usage, profile, Bytes}; | 11 | use ra_prof::{memory_usage, profile, Bytes}; |
12 | use ra_syntax::SourceFile; | ||
13 | #[cfg(not(feature = "wasm"))] | ||
14 | use rayon::prelude::*; | ||
15 | use rustc_hash::FxHashMap; | 12 | use rustc_hash::FxHashMap; |
16 | 13 | ||
17 | use crate::{ | 14 | use crate::{symbol_index::SymbolsDatabase, RootDatabase}; |
18 | symbol_index::{SymbolIndex, SymbolsDatabase}, | ||
19 | DebugData, RootDatabase, | ||
20 | }; | ||
21 | 15 | ||
22 | #[derive(Default)] | 16 | #[derive(Default)] |
23 | pub struct AnalysisChange { | 17 | pub struct AnalysisChange { |
24 | new_roots: Vec<(SourceRootId, bool)>, | 18 | new_roots: Vec<(SourceRootId, bool)>, |
25 | roots_changed: FxHashMap<SourceRootId, RootChange>, | 19 | roots_changed: FxHashMap<SourceRootId, RootChange>, |
26 | files_changed: Vec<(FileId, Arc<String>)>, | 20 | files_changed: Vec<(FileId, Arc<String>)>, |
27 | libraries_added: Vec<LibraryData>, | ||
28 | crate_graph: Option<CrateGraph>, | 21 | crate_graph: Option<CrateGraph>, |
29 | debug_data: DebugData, | ||
30 | } | 22 | } |
31 | 23 | ||
32 | impl fmt::Debug for AnalysisChange { | 24 | impl fmt::Debug for AnalysisChange { |
@@ -41,9 +33,6 @@ impl fmt::Debug for AnalysisChange { | |||
41 | if !self.files_changed.is_empty() { | 33 | if !self.files_changed.is_empty() { |
42 | d.field("files_changed", &self.files_changed.len()); | 34 | d.field("files_changed", &self.files_changed.len()); |
43 | } | 35 | } |
44 | if !self.libraries_added.is_empty() { | ||
45 | d.field("libraries_added", &self.libraries_added.len()); | ||
46 | } | ||
47 | if self.crate_graph.is_some() { | 36 | if self.crate_graph.is_some() { |
48 | d.field("crate_graph", &self.crate_graph); | 37 | d.field("crate_graph", &self.crate_graph); |
49 | } | 38 | } |
@@ -80,17 +69,9 @@ impl AnalysisChange { | |||
80 | self.roots_changed.entry(root_id).or_default().removed.push(file); | 69 | self.roots_changed.entry(root_id).or_default().removed.push(file); |
81 | } | 70 | } |
82 | 71 | ||
83 | pub fn add_library(&mut self, data: LibraryData) { | ||
84 | self.libraries_added.push(data) | ||
85 | } | ||
86 | |||
87 | pub fn set_crate_graph(&mut self, graph: CrateGraph) { | 72 | pub fn set_crate_graph(&mut self, graph: CrateGraph) { |
88 | self.crate_graph = Some(graph); | 73 | self.crate_graph = Some(graph); |
89 | } | 74 | } |
90 | |||
91 | pub fn set_debug_root_path(&mut self, source_root_id: SourceRootId, path: String) { | ||
92 | self.debug_data.root_paths.insert(source_root_id, path); | ||
93 | } | ||
94 | } | 75 | } |
95 | 76 | ||
96 | #[derive(Debug)] | 77 | #[derive(Debug)] |
@@ -121,47 +102,6 @@ impl fmt::Debug for RootChange { | |||
121 | } | 102 | } |
122 | } | 103 | } |
123 | 104 | ||
124 | pub struct LibraryData { | ||
125 | root_id: SourceRootId, | ||
126 | root_change: RootChange, | ||
127 | symbol_index: SymbolIndex, | ||
128 | } | ||
129 | |||
130 | impl fmt::Debug for LibraryData { | ||
131 | fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
132 | f.debug_struct("LibraryData") | ||
133 | .field("root_id", &self.root_id) | ||
134 | .field("root_change", &self.root_change) | ||
135 | .field("n_symbols", &self.symbol_index.len()) | ||
136 | .finish() | ||
137 | } | ||
138 | } | ||
139 | |||
140 | impl LibraryData { | ||
141 | pub fn prepare( | ||
142 | root_id: SourceRootId, | ||
143 | files: Vec<(FileId, RelativePathBuf, Arc<String>)>, | ||
144 | ) -> LibraryData { | ||
145 | let _p = profile("LibraryData::prepare"); | ||
146 | |||
147 | #[cfg(not(feature = "wasm"))] | ||
148 | let iter = files.par_iter(); | ||
149 | #[cfg(feature = "wasm")] | ||
150 | let iter = files.iter(); | ||
151 | |||
152 | let symbol_index = SymbolIndex::for_files(iter.map(|(file_id, _, text)| { | ||
153 | let parse = SourceFile::parse(text); | ||
154 | (*file_id, parse) | ||
155 | })); | ||
156 | let mut root_change = RootChange::default(); | ||
157 | root_change.added = files | ||
158 | .into_iter() | ||
159 | .map(|(file_id, path, text)| AddFile { file_id, path, text }) | ||
160 | .collect(); | ||
161 | LibraryData { root_id, root_change, symbol_index } | ||
162 | } | ||
163 | } | ||
164 | |||
165 | const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100); | 105 | const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100); |
166 | 106 | ||
167 | impl RootDatabase { | 107 | impl RootDatabase { |
@@ -176,6 +116,7 @@ impl RootDatabase { | |||
176 | log::info!("apply_change {:?}", change); | 116 | log::info!("apply_change {:?}", change); |
177 | if !change.new_roots.is_empty() { | 117 | if !change.new_roots.is_empty() { |
178 | let mut local_roots = Vec::clone(&self.local_roots()); | 118 | let mut local_roots = Vec::clone(&self.local_roots()); |
119 | let mut libraries = Vec::clone(&self.library_roots()); | ||
179 | for (root_id, is_local) in change.new_roots { | 120 | for (root_id, is_local) in change.new_roots { |
180 | let root = | 121 | let root = |
181 | if is_local { SourceRoot::new_local() } else { SourceRoot::new_library() }; | 122 | if is_local { SourceRoot::new_local() } else { SourceRoot::new_library() }; |
@@ -183,9 +124,12 @@ impl RootDatabase { | |||
183 | self.set_source_root_with_durability(root_id, Arc::new(root), durability); | 124 | self.set_source_root_with_durability(root_id, Arc::new(root), durability); |
184 | if is_local { | 125 | if is_local { |
185 | local_roots.push(root_id); | 126 | local_roots.push(root_id); |
127 | } else { | ||
128 | libraries.push(root_id) | ||
186 | } | 129 | } |
187 | } | 130 | } |
188 | self.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH); | 131 | self.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH); |
132 | self.set_library_roots_with_durability(Arc::new(libraries), Durability::HIGH); | ||
189 | } | 133 | } |
190 | 134 | ||
191 | for (root_id, root_change) in change.roots_changed { | 135 | for (root_id, root_change) in change.roots_changed { |
@@ -197,29 +141,9 @@ impl RootDatabase { | |||
197 | let durability = durability(&source_root); | 141 | let durability = durability(&source_root); |
198 | self.set_file_text_with_durability(file_id, text, durability) | 142 | self.set_file_text_with_durability(file_id, text, durability) |
199 | } | 143 | } |
200 | if !change.libraries_added.is_empty() { | ||
201 | let mut libraries = Vec::clone(&self.library_roots()); | ||
202 | for library in change.libraries_added { | ||
203 | libraries.push(library.root_id); | ||
204 | self.set_source_root_with_durability( | ||
205 | library.root_id, | ||
206 | Arc::new(SourceRoot::new_library()), | ||
207 | Durability::HIGH, | ||
208 | ); | ||
209 | self.set_library_symbols_with_durability( | ||
210 | library.root_id, | ||
211 | Arc::new(library.symbol_index), | ||
212 | Durability::HIGH, | ||
213 | ); | ||
214 | self.apply_root_change(library.root_id, library.root_change); | ||
215 | } | ||
216 | self.set_library_roots_with_durability(Arc::new(libraries), Durability::HIGH); | ||
217 | } | ||
218 | if let Some(crate_graph) = change.crate_graph { | 144 | if let Some(crate_graph) = change.crate_graph { |
219 | self.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH) | 145 | self.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH) |
220 | } | 146 | } |
221 | |||
222 | Arc::make_mut(&mut self.debug_data).merge(change.debug_data) | ||
223 | } | 147 | } |
224 | 148 | ||
225 | fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) { | 149 | fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) { |