Track all Cargo.tomls, not just the top one

Closes #546

Author: nrc

Cargo.lock

@@ -12,27 +12,28 @@ build = "build.rs"
 [dependencies]
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "9e53ac6e6525da914cb05a85e5e8eff7b5dca81f" }
 cargo_metadata = "0.5.2"
+clippy_lints = { version = "0.0.200", optional = true }
 env_logger = "0.5"
 failure = "0.1.1"
 jsonrpc-core = "8.0.1"
 languageserver-types = "0.41"
 lazy_static = "1"
 log = "0.4"
+num_cpus = "1"
 racer = "2.0.14"
+rayon = "1"
 rls-analysis = "0.13"
 rls-blacklist = "0.1.2"
 rls-data = { version = "0.16", features = ["serialize-serde"] }
 rls-rustc = "0.2.1"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = { version = "0.4.5", features = ["racer-impls"] }
 rustfmt-nightly = "0.7"
-clippy_lints = { version = "0.0.200", optional = true }
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 url = "1.1.0"
-rayon = "1"
-num_cpus = "1"
+walkdir = "2.1"
 
 [dev-dependencies]
 json = "0.11"

Cargo.toml

@@ -19,6 +19,7 @@ use serde_json;
 use url::Url;
 use span;
 use Span;
+use walkdir::WalkDir;
 
 use actions::post_build::{BuildResults, PostBuildHandler, AnalysisQueue};
 use actions::progress::{BuildProgressNotifier, BuildDiagnosticsNotifier};
@@ -364,7 +365,6 @@ fn find_word_at_pos(line: &str, pos: &Column) -> (Column, Column) {
     )
 }
 
-// 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> {
@@ -384,16 +384,37 @@ impl<'ctx> FileWatch<'ctx> {
     }
 
     /// Returns json config for desired file watches
-    pub fn watchers_config(&self) -> serde_json::Value {
-        let cargo_toml_pattern = format!("{}/Cargo.toml", self.project_str);
-        let cargo_lock_pattern = format!("{}/Cargo.lock", self.project_str);
-        let target_pattern = format!("{}/target", self.project_str);
-        // For target, we only watch if it gets deleted.
+    pub fn watchers_config(&self)  -> serde_json::Value {
+        fn watcher(pat: String) -> FileSystemWatcher {
+            FileSystemWatcher {
+                glob_pattern: pat,
+                kind: None,
+            }
+        }
+        fn watcher_with_kind(pat: String, kind: WatchKind) -> FileSystemWatcher {
+            FileSystemWatcher {
+                glob_pattern: pat,
+                kind: Some(kind),
+            }
+        }
+
+        let mut watchers = vec![
+            watcher(format!("{}/Cargo.lock", self.project_str)),
+            // For target, we only watch if it gets deleted.
+            watcher_with_kind(format!("{}/target", self.project_str), WatchKind::Delete),
+        ];
+
+        // Find any Cargo.tomls in the project
+        for entry in WalkDir::new(self.project_str)
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .filter(|e| e.file_name() == "Cargo.toml")
+        {
+            watchers.push(watcher(entry.path().display().to_string()));
+        }
+
         json!({
-            "watchers": [
-                { "globPattern": cargo_toml_pattern },
-                { "globPattern": cargo_lock_pattern },
-                { "globPattern": target_pattern, "kind": 4 }]
+            "watchers": watchers
         })
     }
 
@@ -408,10 +429,13 @@ impl<'ctx> FileWatch<'ctx> {
             return false;
         }
 
+        if path.ends_with("/Cargo.toml") {
+            return true;
+        }
+
         let local = &path[self.project_uri.len()..];
 
-        local == "/Cargo.lock" || local == "/Cargo.toml"
-            || local == "/target" && change.typ == FileChangeType::Deleted
+        local == "/Cargo.lock" || (local == "/target" && change.typ == FileChangeType::Deleted)
     }
 }
 

src/actions/mod.rs

@@ -28,6 +28,7 @@ extern crate cargo_metadata;
 extern crate env_logger;
 #[macro_use]
 extern crate failure;
+extern crate jsonrpc_core;
 extern crate languageserver_types as ls_types;
 #[macro_use]
 extern crate lazy_static;
@@ -50,8 +51,8 @@ extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 
-extern crate jsonrpc_core;
 extern crate url;
+extern crate walkdir;
 
 use std::env;
 use std::sync::Arc;