Merge #489

489: support std r=matklad a=matklad

closes #465 

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

2 files changed, 39 insertions, 8 deletions

diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 9eaf46ac8..02d62a259 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -1,10 +1,15 @@
 mod support;
 
+use std::{
+    collections::HashMap,
+    time::Instant,
+};
+
 use languageserver_types::{
     CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range,
 };
 use ra_lsp_server::req::{
-    CodeActionParams, CodeActionRequest, Formatting, Runnables, RunnablesParams,
+    CodeActionParams, CodeActionRequest, Formatting, Runnables, RunnablesParams, CompletionParams, Completion,
 };
 use serde_json::json;
 
@@ -13,6 +18,32 @@ use crate::support::project;
 const LOG: &'static str = "";
 
 #[test]
+fn completes_items_from_standard_library() {
+    let project_start = Instant::now();
+    let server = project(
+        r#"
+//- Cargo.toml
+[package]
+name = "foo"
+version = "0.0.0"
+
+//- src/lib.rs
+use std::collections::Spam;
+"#,
+    );
+    server.wait_for_feedback("workspace loaded");
+    eprintln!("loading took    {:?}", project_start.elapsed());
+    let completion_start = Instant::now();
+    let res = server.send_request::<Completion>(CompletionParams {
+        text_document: server.doc_id("src/lib.rs"),
+        context: None,
+        position: Position::new(0, 23),
+    });
+    assert!(format!("{}", res).contains("HashMap"));
+    eprintln!("completion took {:?}", completion_start.elapsed());
+}
+
+#[test]
 fn test_runnables_no_project() {
     let server = project(
         r"
@@ -122,7 +153,6 @@ fn test_eggs() {}
     );
 }
 
-use std::collections::HashMap;
 #[test]
 fn test_format_document() {
     let server = project(
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 7db168b0f..46107b6b6 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -93,9 +93,7 @@ impl Server {
         R: Request,
         R::Params: Serialize,
     {
-        let id = self.req_id.get();
-        self.req_id.set(id + 1);
-        let actual = self.send_request::<R>(id, params);
+        let actual = self.send_request::<R>(params);
         match find_mismatch(&expected_resp, &actual) {
             Some((expected_part, actual_part)) => panic!(
                 "JSON mismatch\nExpected:\n{}\nWas:\n{}\nExpected part:\n{}\nActual part:\n{}\n",
@@ -108,11 +106,14 @@ impl Server {
         }
     }
 
-    fn send_request<R>(&self, id: u64, params: R::Params) -> Value
+    pub fn send_request<R>(&self, params: R::Params) -> Value
     where
         R: Request,
         R::Params: Serialize,
     {
+        let id = self.req_id.get();
+        self.req_id.set(id + 1);
+
         let r = RawRequest::new::<R>(id, &params);
         self.send_request_(r)
     }
@@ -178,7 +179,7 @@ impl Server {
 
 impl Drop for Server {
     fn drop(&mut self) {
-        self.send_request::<Shutdown>(666, ());
+        self.send_request::<Shutdown>(());
         let receiver = self.worker.take().unwrap().shutdown();
         while let Some(msg) = recv_timeout(&receiver) {
             drop(msg);
@@ -188,7 +189,7 @@ impl Drop for Server {
 }
 
 fn recv_timeout(receiver: &Receiver<RawMessage>) -> Option<RawMessage> {
-    let timeout = Duration::from_secs(5);
+    let timeout = Duration::from_secs(50);
     select! {
         recv(receiver) -> msg => msg.ok(),
         recv(after(timeout)) -> _ => panic!("timed out"),