Merge #292

292: Vfs r=matklad a=matklad

closes #243



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 3 insertions, 4 deletions

diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 26f5e3f20..029a55d40 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -1,9 +1,7 @@
 mod support;
 
 use serde_json::json;
-
 use ra_lsp_server::req::{Runnables, RunnablesParams, CodeActionRequest, CodeActionParams};
-
 use languageserver_types::{Position, Range, CodeActionContext};
 
 use crate::support::project;
@@ -20,6 +18,7 @@ fn foo() {
 }
 ",
     );
+    server.wait_for_feedback("workspace loaded");
     server.request::<Runnables>(
         RunnablesParams {
             text_document: server.doc_id("lib.rs"),
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 07a878a26..c14d287ca 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -174,11 +174,11 @@ impl Server {
 impl Drop for Server {
     fn drop(&mut self) {
         self.send_request::<Shutdown>(666, ());
-        let receiver = self.worker.take().unwrap().stop();
+        let receiver = self.worker.take().unwrap().shutdown();
         while let Some(msg) = recv_timeout(&receiver) {
             drop(msg);
         }
-        self.watcher.take().unwrap().stop().unwrap();
+        self.watcher.take().unwrap().shutdown().unwrap();
     }
 }