Merge #940

940: Show workspace loaded notification r=matklad a=vipentti

This fixes #935 

This adds support for more `InitializationOptions` which are provided by the client.

Co-authored-by: Ville Penttinen <[email protected]>

2 files changed, 20 insertions, 11 deletions

diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 996bf8e01..1c099a78f 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -31,7 +31,7 @@ version = "0.0.0"
 use std::collections::Spam;
 "#,
     );
-    server.wait_for_feedback("workspace loaded");
+    server.wait_for_message("workspace loaded");
     eprintln!("loading took    {:?}", project_start.elapsed());
     let completion_start = Instant::now();
     let res = server.send_request::<Completion>(CompletionParams {
@@ -53,7 +53,7 @@ fn foo() {
 }
 ",
     );
-    server.wait_for_feedback("workspace loaded");
+    server.wait_for_message("workspace loaded");
     server.request::<Runnables>(
         RunnablesParams { text_document: server.doc_id("lib.rs"), position: None },
         json!([
@@ -107,7 +107,7 @@ pub fn foo() {}
 fn test_eggs() {}
 "#,
     );
-    server.wait_for_feedback("workspace loaded");
+    server.wait_for_message("workspace loaded");
     server.request::<Runnables>(
         RunnablesParams {
             text_document: server.doc_id("tests/spam.rs"),
@@ -167,7 +167,7 @@ fn main() {
 pub use std::collections::HashMap;
 "#,
     );
-    server.wait_for_feedback("workspace loaded");
+    server.wait_for_message("workspace loaded");
 
     server.request::<Formatting>(
         DocumentFormattingParams {
@@ -216,7 +216,7 @@ mod bar;
 fn main() {}
 "#,
     );
-    server.wait_for_feedback("workspace loaded");
+    server.wait_for_message("workspace loaded");
     let empty_context = || CodeActionContext { diagnostics: Vec::new(), only: None };
     server.request::<CodeActionRequest>(
         CodeActionParams {
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index f4e7eaf75..8bfc8d622 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -13,6 +13,7 @@ use lsp_types::{
     notification::DidOpenTextDocument,
     request::{Request, Shutdown},
     DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url,
+    notification::{Notification, ShowMessage},
 };
 use serde::Serialize;
 use serde_json::{to_string_pretty, Value};
@@ -22,6 +23,7 @@ use test_utils::{parse_fixture, find_mismatch};
 
 use ra_lsp_server::{
     main_loop, req,
+    InitializationOptions,
 };
 
 pub fn project(fixture: &str) -> Server {
@@ -56,7 +58,13 @@ impl Server {
             "test server",
             128,
             move |mut msg_receiver, mut msg_sender| {
-                main_loop(true, path, true, &mut msg_receiver, &mut msg_sender).unwrap()
+                main_loop(
+                    path,
+                    InitializationOptions::default(),
+                    &mut msg_receiver,
+                    &mut msg_sender,
+                )
+                .unwrap()
             },
         );
         let res = Server {
@@ -133,13 +141,14 @@ impl Server {
         }
         panic!("no response");
     }
-    pub fn wait_for_feedback(&self, feedback: &str) {
-        self.wait_for_feedback_n(feedback, 1)
+    pub fn wait_for_message(&self, message: &str) {
+        self.wait_for_message_n(message, 1)
     }
-    pub fn wait_for_feedback_n(&self, feedback: &str, n: usize) {
+    pub fn wait_for_message_n(&self, message: &str, n: usize) {
         let f = |msg: &RawMessage| match msg {
-            RawMessage::Notification(n) if n.method == "internalFeedback" => {
-                return n.clone().cast::<req::InternalFeedback>().unwrap() == feedback;
+            RawMessage::Notification(n) if n.method == ShowMessage::METHOD => {
+                let msg = n.clone().cast::<req::ShowMessage>().unwrap();
+                msg.message == message
             }
             _ => false,
         };