Merge pull request #661 from alexheretic/fix-rustc-cwd

Add `test_hover_after_src_line_change` and fix rustc-cwd

Author: Xanewok

Cargo.lock

@@ -15,7 +15,7 @@ env_logger = "0.4"
 failure = "0.1.1"
 jsonrpc-core = "8.0.1"
 languageserver-types = "0.27"
-lazy_static = "0.2"
+lazy_static = "1"
 log = "0.3"
 racer = "2.0.12"
 rls-analysis = "0.10"

Cargo.toml

@@ -331,17 +331,13 @@ impl JobQueue {
         // to Cargo (which we do currently) in `prepare_work`
         assert!(self.0.is_empty() == false);
 
-        let build_dir = internals
-            .compilation_cx
-            .lock()
-            .unwrap()
-            .build_dir
-            .clone()
-            .unwrap();
-
         let mut compiler_messages = vec![];
         let mut analyses = vec![];
-        let mut cwd = PathBuf::from(".");
+        let (build_dir, mut cwd) = {
+            let comp_cx = internals.compilation_cx.lock().unwrap();
+            (comp_cx.build_dir.clone().unwrap(), comp_cx.cwd.clone())
+        };
+
         // Go through cached compiler invocations sequentially, collecting each
         // invocation's compiler messages for diagnostics and analysis data
         while let Some(job) = self.dequeue() {
@@ -358,22 +354,26 @@ impl JobQueue {
                 &internals.vfs,
                 &args,
                 job.get_envs(),
-                None,
+                cwd.as_ref().map(|p| &**p),
                 &build_dir,
                 internals.config.clone(),
                 internals.env_lock.as_facade(),
             ) {
                 BuildResult::Success(c, mut messages, mut analysis) => {
                     compiler_messages.append(&mut messages);
                     analyses.append(&mut analysis);
-                    cwd = c;
+                    cwd = Some(c);
                 }
                 BuildResult::Err => return BuildResult::Err,
                 _ => {}
             }
         }
 
-        BuildResult::Success(cwd, compiler_messages, analyses)
+        BuildResult::Success(
+            cwd.unwrap_or_else(|| PathBuf::from(".")),
+            compiler_messages,
+            analyses,
+        )
     }
 }
 

src/build/plan.rs

@@ -17,9 +17,9 @@ extern crate json;
 mod harness;
 
 use analysis;
-use actions::requests;
+use actions::{requests, notifications};
 use config::{Config, Inferrable};
-use server::{self as ls_server, Request, ShutdownRequest};
+use server::{self as ls_server, Request, ShutdownRequest, Notification};
 use jsonrpc_core;
 use vfs;
 
@@ -90,6 +90,13 @@ pub fn request<'a, T: ls_server::RequestAction>(id: usize, params: T::Params) ->
     }
 }
 
+fn notification<'a, A: ls_server::BlockingNotificationAction>(params: A::Params) -> Notification<A> {
+    Notification {
+        params,
+        _action: PhantomData,
+    }
+}
+
 #[test]
 fn test_shutdown() {
     let mut env = Environment::new("common");
@@ -226,6 +233,118 @@ fn test_hover() {
     );
 }
 
+/// Test hover continues to work after the source has moved line
+#[test]
+fn test_hover_after_src_line_change() {
+    let mut env = Environment::new("common");
+
+    let source_file_path = Path::new("src").join("main.rs");
+
+    let root_path = env.cache.abs_path(Path::new("."));
+    let url = Url::from_file_path(env.cache.abs_path(&source_file_path))
+        .expect("couldn't convert file path to URL");
+
+    let world_src_pos = env.cache.mk_ls_position(src(&source_file_path, 21, "world"));
+    let world_src_pos_after = Position {
+        line: world_src_pos.line + 1,
+        ..world_src_pos
+    };
+
+    let messages = vec![
+        initialize(0, root_path.as_os_str().to_str().map(|x| x.to_owned())).to_string(),
+
+        request::<requests::Hover>(
+            11,
+            TextDocumentPositionParams {
+                text_document: TextDocumentIdentifier::new(url.clone()),
+                position: world_src_pos,
+            },
+        ).to_string(),
+
+        notification::<notifications::DidChangeTextDocument>(
+            DidChangeTextDocumentParams {
+                text_document: VersionedTextDocumentIdentifier {
+                    uri: url.clone(),
+                    version: Some(2),
+                },
+                content_changes: vec![TextDocumentContentChangeEvent {
+                    range: Some(Range {
+                        start: Position { line: 19, character: 15 },
+                        end: Position { line: 19, character: 15 },
+                    }),
+                    range_length: Some(0),
+                    text: "\n    ".into(),
+                }],
+            },
+        ).to_string(),
+
+        request::<requests::Hover>(
+            13,
+            TextDocumentPositionParams {
+                text_document: TextDocumentIdentifier::new(url),
+                position: world_src_pos_after,
+            },
+        ).to_string(),
+    ];
+
+    let (mut server, results) = env.mock_server(messages);
+    // Initialize and build.
+    assert_eq!(
+        ls_server::LsService::handle_message(&mut server),
+        ls_server::ServerStateChange::Continue
+    );
+    expect_messages(
+        results.clone(),
+        &[
+            ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
+            ExpectedMessage::new(None).expect_contains("beginBuild"),
+            ExpectedMessage::new(None).expect_contains("diagnosticsBegin"),
+            ExpectedMessage::new(None).expect_contains("diagnosticsEnd"),
+        ],
+    );
+
+    // first hover over unmodified
+    assert_eq!(
+        ls_server::LsService::handle_message(&mut server),
+        ls_server::ServerStateChange::Continue
+    );
+    expect_messages(
+        results.clone(),
+        &[
+            ExpectedMessage::new(Some(11))
+                .expect_contains(r#"[{"language":"rust","value":"&str"}]"#),
+        ],
+    );
+
+    // handle didChange notification and wait for rebuild
+    assert_eq!(
+        ls_server::LsService::handle_message(&mut server),
+        ls_server::ServerStateChange::Continue
+    );
+
+    expect_messages(
+        results.clone(),
+        &[
+            ExpectedMessage::new(None).expect_contains("beginBuild"),
+            ExpectedMessage::new(None).expect_contains("diagnosticsBegin"),
+            ExpectedMessage::new(None).expect_contains("diagnosticsEnd"),
+        ],
+    );
+
+    // hover after line change should work at the new line
+    assert_eq!(
+        ls_server::LsService::handle_message(&mut server),
+        ls_server::ServerStateChange::Continue
+    );
+    expect_messages(
+        results.clone(),
+        &[
+            ExpectedMessage::new(Some(13))
+                .expect_contains(r#"[{"language":"rust","value":"&str"}]"#),
+        ],
+    );
+}
+
 #[test]
 fn test_workspace_symbol() {
     let mut env = Environment::new("workspace_symbol");