aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-07-10 22:39:25 +0100
committerAleksey Kladov <[email protected]>2020-07-10 22:45:07 +0100
commitdac9a4cebd39e7865235530fa69e5ae4ab42962b (patch)
treea66dd53b5ac61976eb94c8ed535efd949bbaf998 /crates
parent65984773d347badfbde4fa013a28b2a0d7e5a0e3 (diff)
Don't spawn notify unnecessary
Diffstat (limited to 'crates')
-rw-r--r--crates/rust-analyzer/src/reload.rs1
-rw-r--r--crates/vfs-notify/src/include.rs1
-rw-r--r--crates/vfs-notify/src/lib.rs12
3 files changed, 8 insertions, 6 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index ffe234a5b..a81ecdf20 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -182,6 +182,7 @@ impl GlobalState {
182 } 182 }
183 }, 183 },
184 }; 184 };
185
185 let watch = match self.config.files.watcher { 186 let watch = match self.config.files.watcher {
186 FilesWatcher::Client => vec![], 187 FilesWatcher::Client => vec![],
187 FilesWatcher::Notify => project_folders.watch, 188 FilesWatcher::Notify => project_folders.watch,
diff --git a/crates/vfs-notify/src/include.rs b/crates/vfs-notify/src/include.rs
index 72f928536..59da3d77a 100644
--- a/crates/vfs-notify/src/include.rs
+++ b/crates/vfs-notify/src/include.rs
@@ -1,5 +1,4 @@
1//! See `Include`. 1//! See `Include`.
2
3use std::convert::TryFrom; 2use std::convert::TryFrom;
4 3
5use globset::{Glob, GlobSet, GlobSetBuilder}; 4use globset::{Glob, GlobSet, GlobSetBuilder};
diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
index ee5035554..6aaa53f63 100644
--- a/crates/vfs-notify/src/lib.rs
+++ b/crates/vfs-notify/src/lib.rs
@@ -82,11 +82,13 @@ impl NotifyActor {
82 Event::Message(msg) => match msg { 82 Event::Message(msg) => match msg {
83 Message::Config(config) => { 83 Message::Config(config) => {
84 self.watcher = None; 84 self.watcher = None;
85 let (watcher_sender, watcher_receiver) = unbounded(); 85 if !config.watch.is_empty() {
86 let watcher = log_notify_error(Watcher::new_immediate(move |event| { 86 let (watcher_sender, watcher_receiver) = unbounded();
87 watcher_sender.send(event).unwrap() 87 let watcher = log_notify_error(Watcher::new_immediate(move |event| {
88 })); 88 watcher_sender.send(event).unwrap()
89 self.watcher = watcher.map(|it| (it, watcher_receiver)); 89 }));
90 self.watcher = watcher.map(|it| (it, watcher_receiver));
91 }
90 92
91 let n_total = config.load.len(); 93 let n_total = config.load.len();
92 self.send(loader::Message::Progress { n_total, n_done: 0 }); 94 self.send(loader::Message::Progress { n_total, n_done: 0 });