From a5ef8ad05b7c1f7148c59814b55d641fd75aff75 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 19 Dec 2018 15:04:15 +0300
Subject: swtich lsp server to vfs

---
 crates/ra_analysis/src/imp.rs | 9 ++++++---
 crates/ra_analysis/src/lib.rs | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'crates/ra_analysis')

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 51bcd5a73..54f38b285 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -43,14 +43,17 @@ impl AnalysisHostImpl {
     pub fn apply_change(&mut self, change: AnalysisChange) {
         log::info!("apply_change {:?}", change);
         // self.gc_syntax_trees();
+        for root_id in change.new_roots {
+            self.db
+                .query_mut(ra_db::SourceRootQuery)
+                .set(root_id, Default::default());
+        }
 
         for (root_id, root_change) in change.roots_changed {
             self.apply_root_change(root_id, root_change);
         }
         for (file_id, text) in change.files_changed {
-            self.db
-                .query_mut(ra_db::FileTextQuery)
-                .set(file_id, Arc::new(text))
+            self.db.query_mut(ra_db::FileTextQuery).set(file_id, text)
         }
         if !change.libraries_added.is_empty() {
             let mut libraries = Vec::clone(&self.db.libraries());
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index b806c974d..8882feca3 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -44,8 +44,9 @@ pub use ra_db::{
 
 #[derive(Default)]
 pub struct AnalysisChange {
+    new_roots: Vec<SourceRootId>,
     roots_changed: FxHashMap<SourceRootId, RootChange>,
-    files_changed: Vec<(FileId, String)>,
+    files_changed: Vec<(FileId, Arc<String>)>,
     libraries_added: Vec<LibraryData>,
     crate_graph: Option<CrateGraph>,
 }
@@ -93,6 +94,9 @@ impl AnalysisChange {
     pub fn new() -> AnalysisChange {
         AnalysisChange::default()
     }
+    pub fn add_root(&mut self, root_id: SourceRootId) {
+        self.new_roots.push(root_id);
+    }
     pub fn add_file(
         &mut self,
         root_id: SourceRootId,
@@ -111,7 +115,7 @@ impl AnalysisChange {
             .added
             .push(file);
     }
-    pub fn change_file(&mut self, file_id: FileId, new_text: String) {
+    pub fn change_file(&mut self, file_id: FileId, new_text: Arc<String>) {
         self.files_changed.push((file_id, new_text))
     }
     pub fn remove_file(&mut self, root_id: SourceRootId, file_id: FileId, path: RelativePathBuf) {
-- 
cgit v1.2.3