From 6b86f038d61752bbf306ed5dd9def74be3b5dcc1 Mon Sep 17 00:00:00 2001
From: Bernardo <berublan@gmail.com>
Date: Mon, 7 Jan 2019 21:35:18 +0100
Subject: refator to move all io to io module use same channel for scanner and
 watcher some implementations pending

---
 crates/ra_lsp_server/src/main_loop.rs | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'crates/ra_lsp_server/src')

diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index e5a0603d1..4f984ebc7 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -113,7 +113,6 @@ enum Event {
     Msg(RawMessage),
     Task(Task),
     Vfs(VfsTask),
-    Watcher(WatcherChange),
     Lib(LibraryData),
 }
 
@@ -150,7 +149,6 @@ impl fmt::Debug for Event {
             Event::Task(it) => fmt::Debug::fmt(it, f),
             Event::Vfs(it) => fmt::Debug::fmt(it, f),
             Event::Lib(it) => fmt::Debug::fmt(it, f),
-            Event::Watcher(it) => fmt::Debug::fmt(it, f),
         }
     }
 }
@@ -185,10 +183,6 @@ fn main_loop_inner(
                 Ok(task) => Event::Vfs(task),
                 Err(RecvError) => bail!("vfs died"),
             },
-            recv(state.vfs.read().change_receiver()) -> change => match change {
-                Ok(change) => Event::Watcher(change),
-                Err(RecvError) => bail!("vfs watcher died"),
-            },
             recv(libdata_receiver) -> data => Event::Lib(data.unwrap())
         };
         log::info!("loop_turn = {:?}", event);
@@ -200,10 +194,6 @@ fn main_loop_inner(
                 state.vfs.write().handle_task(task);
                 state_changed = true;
             }
-            Event::Watcher(change) => {
-                state.vfs.write().handle_change(change);
-                state_changed = true;
-            }
             Event::Lib(lib) => {
                 feedback(internal_mode, "library loaded", msg_sender);
                 state.add_lib(lib);
@@ -375,7 +365,7 @@ fn on_notification(
             if let Some(file_id) = state
                 .vfs
                 .write()
-                .add_file_overlay(&path, Some(params.text_document.text))
+                .add_file_overlay(&path, params.text_document.text)
             {
                 subs.add_sub(FileId(file_id.0.into()));
             }
@@ -394,10 +384,7 @@ fn on_notification(
                 .pop()
                 .ok_or_else(|| format_err!("empty changes"))?
                 .text;
-            state
-                .vfs
-                .write()
-                .change_file_overlay(path.as_path(), Some(text));
+            state.vfs.write().change_file_overlay(path.as_path(), text);
             return Ok(());
         }
         Err(not) => not,
-- 
cgit v1.2.3