diff options
Diffstat (limited to 'crates/ra_lsp_server/tests/heavy_tests/support.rs')
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 21 |
1 files changed, 15 insertions, 6 deletions
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::{ | |||
13 | notification::DidOpenTextDocument, | 13 | notification::DidOpenTextDocument, |
14 | request::{Request, Shutdown}, | 14 | request::{Request, Shutdown}, |
15 | DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, | 15 | DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, |
16 | notification::{Notification, ShowMessage}, | ||
16 | }; | 17 | }; |
17 | use serde::Serialize; | 18 | use serde::Serialize; |
18 | use serde_json::{to_string_pretty, Value}; | 19 | use serde_json::{to_string_pretty, Value}; |
@@ -22,6 +23,7 @@ use test_utils::{parse_fixture, find_mismatch}; | |||
22 | 23 | ||
23 | use ra_lsp_server::{ | 24 | use ra_lsp_server::{ |
24 | main_loop, req, | 25 | main_loop, req, |
26 | InitializationOptions, | ||
25 | }; | 27 | }; |
26 | 28 | ||
27 | pub fn project(fixture: &str) -> Server { | 29 | pub fn project(fixture: &str) -> Server { |
@@ -56,7 +58,13 @@ impl Server { | |||
56 | "test server", | 58 | "test server", |
57 | 128, | 59 | 128, |
58 | move |mut msg_receiver, mut msg_sender| { | 60 | move |mut msg_receiver, mut msg_sender| { |
59 | main_loop(true, path, true, &mut msg_receiver, &mut msg_sender).unwrap() | 61 | main_loop( |
62 | path, | ||
63 | InitializationOptions::default(), | ||
64 | &mut msg_receiver, | ||
65 | &mut msg_sender, | ||
66 | ) | ||
67 | .unwrap() | ||
60 | }, | 68 | }, |
61 | ); | 69 | ); |
62 | let res = Server { | 70 | let res = Server { |
@@ -133,13 +141,14 @@ impl Server { | |||
133 | } | 141 | } |
134 | panic!("no response"); | 142 | panic!("no response"); |
135 | } | 143 | } |
136 | pub fn wait_for_feedback(&self, feedback: &str) { | 144 | pub fn wait_for_message(&self, message: &str) { |
137 | self.wait_for_feedback_n(feedback, 1) | 145 | self.wait_for_message_n(message, 1) |
138 | } | 146 | } |
139 | pub fn wait_for_feedback_n(&self, feedback: &str, n: usize) { | 147 | pub fn wait_for_message_n(&self, message: &str, n: usize) { |
140 | let f = |msg: &RawMessage| match msg { | 148 | let f = |msg: &RawMessage| match msg { |
141 | RawMessage::Notification(n) if n.method == "internalFeedback" => { | 149 | RawMessage::Notification(n) if n.method == ShowMessage::METHOD => { |
142 | return n.clone().cast::<req::InternalFeedback>().unwrap() == feedback; | 150 | let msg = n.clone().cast::<req::ShowMessage>().unwrap(); |
151 | msg.message == message | ||
143 | } | 152 | } |
144 | _ => false, | 153 | _ => false, |
145 | }; | 154 | }; |