From 7c7cfc5f04c51ed1e31b6a3091efc3941b3383c2 Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 13 Apr 2019 19:45:21 +0200
Subject: Sends cwd info for runnables and code lenses

---
 crates/ra_lsp_server/src/main_loop/handlers.rs | 5 +++++
 crates/ra_lsp_server/src/req.rs                | 1 +
 crates/ra_lsp_server/src/server_world.rs       | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'crates/ra_lsp_server/src')

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index b96deb061..41d1f759f 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -263,6 +263,7 @@ pub fn handle_runnables(
     let line_index = world.analysis().file_line_index(file_id);
     let offset = params.position.map(|it| it.conv_with(&line_index));
     let mut res = Vec::new();
+    let workspace_root = world.workspace_root_for(file_id);
     for runnable in world.analysis().runnables(file_id)? {
         if let Some(offset) = offset {
             if !runnable.range.contains_inclusive(offset) {
@@ -287,6 +288,7 @@ pub fn handle_runnables(
                 m.insert("RUST_BACKTRACE".to_string(), "short".to_string());
                 m
             },
+            cwd: workspace_root.map(|root| root.to_string_lossy().to_string()),
         };
         res.push(r);
     }
@@ -309,6 +311,7 @@ pub fn handle_runnables(
         bin: "cargo".to_string(),
         args: check_args,
         env: FxHashMap::default(),
+        cwd: workspace_root.map(|root| root.to_string_lossy().to_string()),
     });
     Ok(res)
 }
@@ -627,6 +630,7 @@ pub fn handle_code_lens(
     let line_index = world.analysis().file_line_index(file_id);
 
     let mut lenses: Vec<CodeLens> = Default::default();
+    let workspace_root = world.workspace_root_for(file_id);
 
     // Gather runnables
     for runnable in world.analysis().runnables(file_id)? {
@@ -647,6 +651,7 @@ pub fn handle_code_lens(
                 bin: "cargo".into(),
                 args,
                 env: Default::default(),
+                cwd: workspace_root.map(|root| root.to_string_lossy().to_string()),
             };
 
             let lens = CodeLens {
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index e0571fd78..4f35ab9b5 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -163,6 +163,7 @@ pub struct Runnable {
     pub bin: String,
     pub args: Vec<String>,
     pub env: FxHashMap<String, String>,
+    pub cwd: Option<String>,
 }
 
 #[derive(Serialize, Debug)]
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index 45ad8e24e..b2808b817 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -1,5 +1,5 @@
 use std::{
-    path::PathBuf,
+    path::{Path, PathBuf},
     sync::Arc,
 };
 
@@ -195,4 +195,9 @@ impl ServerWorld {
         res.push_str(&self.analysis.status());
         res
     }
+
+    pub fn workspace_root_for(&self, file_id: FileId) -> Option<&Path> {
+        let path = self.vfs.read().file2path(VfsFile(file_id.0.into()));
+        self.workspaces.iter().find_map(|ws| ws.workspace_root_for(&path))
+    }
 }
-- 
cgit v1.2.3