Merge #2791

2791: Slightly more robust cargo watcher root search r=kiljacken a=kiljacken

Fixes #2780 (hopefully).

Use the already painstakingly found `workspaces` instead of naively using `folder_roots` from editor.

Co-authored-by: Emil Lauridsen <[email protected]>

1 files changed, 6 insertions, 0 deletions

diff --git a/crates/ra_cargo_watch/src/lib.rs b/crates/ra_cargo_watch/src/lib.rs
index 9bc0fd405..cb0856aa4 100644
--- a/crates/ra_cargo_watch/src/lib.rs
+++ b/crates/ra_cargo_watch/src/lib.rs
@@ -58,6 +58,12 @@ impl CheckWatcher {
         CheckWatcher { task_recv, cmd_send: Some(cmd_send), handle: Some(handle), shared }
     }
 
+    /// Returns a CheckWatcher that doesn't actually do anything
+    pub fn dummy() -> CheckWatcher {
+        let shared = Arc::new(RwLock::new(CheckWatcherSharedState::new()));
+        CheckWatcher { task_recv: never(), cmd_send: None, handle: None, shared }
+    }
+
     /// Schedule a re-start of the cargo check worker.
     pub fn update(&self) {
         if let Some(cmd_send) = &self.cmd_send {