Move ide::AnalysisChange -> base_db::Change

This seems like a better factoring logically; ideally, clients shouldn't touch
`set_` methods of the database directly. Additionally, I think this
should remove the unfortunate duplication in fixture code.

2 files changed, 7 insertions, 73 deletions

diff --git a/crates/ide_db/src/change.rs b/crates/ide_db/src/apply_change.rs
index 7f98111c4..da16fa21d 100644
--- a/crates/ide_db/src/change.rs
+++ b/crates/ide_db/src/apply_change.rs
@@ -1,58 +1,16 @@
-//! Defines a unit of change that can applied to a state of IDE to get the next
-//! state. Changes are transactional.
+//! Applies changes to the IDE state transactionally.
 
 use std::{fmt, sync::Arc};
 
 use base_db::{
     salsa::{Database, Durability, SweepStrategy},
-    CrateGraph, FileId, SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId,
+    Change, FileId, SourceRootId,
 };
 use profile::{memory_usage, Bytes};
 use rustc_hash::FxHashSet;
 
 use crate::{symbol_index::SymbolsDatabase, RootDatabase};
 
-#[derive(Default)]
-pub struct AnalysisChange {
-    roots: Option<Vec<SourceRoot>>,
-    files_changed: Vec<(FileId, Option<Arc<String>>)>,
-    crate_graph: Option<CrateGraph>,
-}
-
-impl fmt::Debug for AnalysisChange {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut d = fmt.debug_struct("AnalysisChange");
-        if let Some(roots) = &self.roots {
-            d.field("roots", roots);
-        }
-        if !self.files_changed.is_empty() {
-            d.field("files_changed", &self.files_changed.len());
-        }
-        if self.crate_graph.is_some() {
-            d.field("crate_graph", &self.crate_graph);
-        }
-        d.finish()
-    }
-}
-
-impl AnalysisChange {
-    pub fn new() -> AnalysisChange {
-        AnalysisChange::default()
-    }
-
-    pub fn set_roots(&mut self, roots: Vec<SourceRoot>) {
-        self.roots = Some(roots);
-    }
-
-    pub fn change_file(&mut self, file_id: FileId, new_text: Option<Arc<String>>) {
-        self.files_changed.push((file_id, new_text))
-    }
-
-    pub fn set_crate_graph(&mut self, graph: CrateGraph) {
-        self.crate_graph = Some(graph);
-    }
-}
-
 #[derive(Debug)]
 struct AddFile {
     file_id: FileId,
@@ -87,41 +45,25 @@ impl RootDatabase {
         self.salsa_runtime_mut().synthetic_write(Durability::LOW);
     }
 
-    pub fn apply_change(&mut self, change: AnalysisChange) {
+    pub fn apply_change(&mut self, change: Change) {
         let _p = profile::span("RootDatabase::apply_change");
         self.request_cancellation();
         log::info!("apply_change {:?}", change);
-        if let Some(roots) = change.roots {
+        if let Some(roots) = &change.roots {
             let mut local_roots = FxHashSet::default();
             let mut library_roots = FxHashSet::default();
-            for (idx, root) in roots.into_iter().enumerate() {
+            for (idx, root) in roots.iter().enumerate() {
                 let root_id = SourceRootId(idx as u32);
-                let durability = durability(&root);
                 if root.is_library {
                     library_roots.insert(root_id);
                 } else {
                     local_roots.insert(root_id);
                 }
-                for file_id in root.iter() {
-                    self.set_file_source_root_with_durability(file_id, root_id, durability);
-                }
-                self.set_source_root_with_durability(root_id, Arc::new(root), durability);
             }
             self.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH);
             self.set_library_roots_with_durability(Arc::new(library_roots), Durability::HIGH);
         }
-
-        for (file_id, text) in change.files_changed {
-            let source_root_id = self.file_source_root(file_id);
-            let source_root = self.source_root(source_root_id);
-            let durability = durability(&source_root);
-            // XXX: can't actually remove the file, just reset the text
-            let text = text.unwrap_or_default();
-            self.set_file_text_with_durability(file_id, text, durability)
-        }
-        if let Some(crate_graph) = change.crate_graph {
-            self.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH)
-        }
+        change.apply(self);
     }
 
     pub fn collect_garbage(&mut self) {
@@ -295,11 +237,3 @@ impl RootDatabase {
         acc
     }
 }
-
-fn durability(source_root: &SourceRoot) -> Durability {
-    if source_root.is_library {
-        Durability::HIGH
-    } else {
-        Durability::LOW
-    }
-}
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 0d209c6ec..7eff247c7 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -2,10 +2,10 @@
 //!
 //! It is mainly a `HirDatabase` for semantic analysis, plus a `SymbolsDatabase`, for fuzzy search.
 
+mod apply_change;
 pub mod label;
 pub mod line_index;
 pub mod symbol_index;
-pub mod change;
 pub mod defs;
 pub mod search;
 pub mod imports_locator;