Bind watch & filter not watched logic together

Author: alexheretic

src/actions/mod.rs

@@ -11,6 +11,8 @@
 use analysis::AnalysisHost;
 use vfs::Vfs;
 use config::{Config, FmtConfig};
+use serde_json;
+use url::Url;
 use span;
 use Span;
 
@@ -211,6 +213,49 @@ fn find_word_at_pos(line: &str, pos: &Column) -> (Column, Column) {
     (span::Column::new_zero_indexed(start), span::Column::new_zero_indexed(end))
 }
 
+// TODO include workspace Cargo.tomls in watchers / relevant
+/// Client file-watching request / filtering logic
+/// We want to watch workspace 'Cargo.toml', root 'Cargo.lock' & the root 'target' dir
+pub struct FileWatch<'ctx> {
+    project_str: &'ctx str,
+    project_uri: String,
+}
+
+impl<'ctx> FileWatch<'ctx> {
+    pub fn new(ctx: &'ctx InitActionContext) -> Self {
+        Self {
+            project_str: ctx.current_project.to_str().unwrap(),
+            project_uri: Url::from_file_path(&ctx.current_project).unwrap().into_string(),
+        }
+    }
+
+    /// Returns json config for desired file watches
+    pub fn watchers_config(&self) -> serde_json::Value {
+        let pattern = format!("{}/Cargo{{.toml,.lock}}", self.project_str);
+        let target_pattern = format!("{}/target", self.project_str);
+        // For target, we only watch if it gets deleted.
+        json!({
+            "watchers": [{ "globPattern": pattern }, { "globPattern": target_pattern, "kind": 4 }]
+        })
+    }
+
+    /// Returns if a file change is relevant to the files we actually wanted to watch
+    #[inline]
+    pub fn is_relevant(&self, change: &FileEvent) -> bool {
+        let path = change.uri.as_str();
+
+        if !path.starts_with(&self.project_uri) {
+            return false;
+        }
+
+        let local = &path[self.project_uri.len()..];
+
+        local == "/Cargo.lock" || local == "Cargo.toml"
+            || local == "/target" && change.typ == FileChangeType::Deleted
+    }
+}
+
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -244,4 +289,4 @@ mod test {
         assert_range("span::Position<|T>", (15, 16));
         assert_range("span::Position<T|>", (15, 16));
     }
-}
+}

src/actions/notifications.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use actions::ActionContext;
+use actions::FileWatch;
 use vfs::Change;
 use config::Config;
 use serde::Deserialize;
@@ -42,13 +43,7 @@ impl<'a> NotificationAction<'a> for Initialized {
 
         let ctx = ctx.inited();
 
-        // TODO we should watch for workspace Cargo.tomls too
-        let pattern = format!("{}/Cargo{{.toml,.lock}}", ctx.current_project.to_str().unwrap());
-        let target_pattern = format!("{}/target", ctx.current_project.to_str().unwrap());
-        // For target, we only watch if it gets deleted.
-        let options = json!({
-            "watchers": [{ "globPattern": pattern }, { "globPattern": target_pattern, "kind": 4 }]
-        });
+        let options = FileWatch::new(&ctx).watchers_config();
         let output = serde_json::to_string(
             &RequestMessage::new(out.provide_id(),
                                  NOTIFICATION__RegisterCapability.to_owned(),
@@ -279,17 +274,14 @@ impl<'a> NotificationAction<'a> for DidChangeWatchedFiles {
     ) -> Result<(), ()> {
         trace!("on_cargo_change: thread: {:?}", thread::current().id());
 
+        let ctx = ctx.inited();
+        let file_watch = FileWatch::new(&ctx);
+
         // ignore irrelevant files from more spammy clients
-        if !params.changes.iter().any(|change| {
-                change.uri.as_str().ends_with("/Cargo.toml") ||
-                change.uri.as_str().ends_with("/Cargo.lock") ||
-                change.typ == FileChangeType::Deleted && change.uri.as_str().ends_with("/target")
-            })
-        {
+        if !params.changes.iter().any(|c| file_watch.is_relevant(c)) {
             return Ok(());
         }
 
-        let ctx = ctx.inited();
         ctx.build_current_project(BuildPriority::Cargo, out);
 
         Ok(())