1 files changed, 42 insertions, 55 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index d854b0156..fca5700a6 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -9,7 +9,7 @@ use lsp_types::{
     TextEdit, WorkspaceEdit,
 };
 use ra_ide_api::{
-    AssistId, Cancelable, FileId, FilePosition, FileRange, FoldKind, Query, RunnableKind,
+    AssistId, Cancelable, FileId, FilePosition, FileRange, FoldKind, Query, Runnable, RunnableKind,
 };
 use ra_prof::profile;
 use ra_syntax::{AstNode, SyntaxKind, TextRange, TextUnit};
@@ -325,27 +325,13 @@ pub fn handle_runnables(
                 continue;
             }
         }
-
-        let args = runnable_args(&world, file_id, &runnable.kind)?;
-
-        let r = req::Runnable {
-            range: runnable.range.conv_with(&line_index),
-            label: match &runnable.kind {
-                RunnableKind::Test { name } => format!("test {}", name),
-                RunnableKind::TestMod { path } => format!("test-mod {}", path),
-                RunnableKind::Bench { name } => format!("bench {}", name),
-                RunnableKind::Bin => "run binary".to_string(),
-            },
-            bin: "cargo".to_string(),
-            args,
-            env: {
-                let mut m = FxHashMap::default();
-                m.insert("RUST_BACKTRACE".to_string(), "short".to_string());
-                m
-            },
-            cwd: workspace_root.map(|root| root.to_string_lossy().to_string()),
+        let label = match &runnable.kind {
+            RunnableKind::Test { name } => format!("test {}", name),
+            RunnableKind::TestMod { path } => format!("test-mod {}", path),
+            RunnableKind::Bench { name } => format!("bench {}", name),
+            RunnableKind::Bin => "run binary".to_string(),
         };
-        res.push(r);
+        res.push(to_lsp_runnable(&world, file_id, runnable, label)?);
     }
     let mut check_args = vec!["check".to_string()];
     let label;
@@ -693,46 +679,26 @@ 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)? {
         let title = match &runnable.kind {
-            RunnableKind::Test { .. } | RunnableKind::TestMod { .. } => Some("▶️Run Test"),
-            RunnableKind::Bench { .. } => Some("Run Bench"),
-            RunnableKind::Bin => Some("️Run"),
+            RunnableKind::Test { .. } | RunnableKind::TestMod { .. } => "▶️Run Test",
+            RunnableKind::Bench { .. } => "Run Bench",
+            RunnableKind::Bin => "Run",
+        };
+        let r = to_lsp_runnable(&world, file_id, runnable, title.to_string())?;
+        let lens = CodeLens {
+            range: r.range,
+            command: Some(Command {
+                title: title.to_string(),
+                command: "rust-analyzer.runSingle".into(),
+                arguments: Some(vec![to_value(r).unwrap()]),
+            }),
+            data: None,
         };
 
-        if let Some(title) = title {
-            let args = runnable_args(&world, file_id, &runnable.kind)?;
-            let range = runnable.range.conv_with(&line_index);
-
-            // This represents the actual command that will be run.
-            let r: req::Runnable = req::Runnable {
-                range,
-                label: Default::default(),
-                bin: "cargo".into(),
-                args,
-                env: {
-                    let mut m = FxHashMap::default();
-                    m.insert("RUST_BACKTRACE".to_string(), "short".to_string());
-                    m
-                },
-                cwd: workspace_root.map(|root| root.to_string_lossy().to_string()),
-            };
-
-            let lens = CodeLens {
-                range,
-                command: Some(Command {
-                    title: title.into(),
-                    command: "rust-analyzer.runSingle".into(),
-                    arguments: Some(vec![to_value(r).unwrap()]),
-                }),
-                data: None,
-            };
-
-            lenses.push(lens);
-        }
+        lenses.push(lens);
     }
 
     // Handle impls
@@ -860,6 +826,27 @@ pub fn publish_decorations(
     Ok(req::PublishDecorationsParams { uri, decorations: highlight(&world, file_id)? })
 }
 
+fn to_lsp_runnable(
+    world: &WorldSnapshot,
+    file_id: FileId,
+    runnable: Runnable,
+    label: String,
+) -> Result<req::Runnable> {
+    let args = runnable_args(world, file_id, &runnable.kind)?;
+    let line_index = world.analysis().file_line_index(file_id)?;
+    Ok(req::Runnable {
+        range: runnable.range.conv_with(&line_index),
+        label,
+        bin: "cargo".to_string(),
+        args,
+        env: {
+            let mut m = FxHashMap::default();
+            m.insert("RUST_BACKTRACE".to_string(), "short".to_string());
+            m
+        },
+        cwd: world.workspace_root_for(file_id).map(|root| root.to_string_lossy().to_string()),
+    })
+}
 fn highlight(world: &WorldSnapshot, file_id: FileId) -> Result<Vec<Decoration>> {
     let line_index = world.analysis().file_line_index(file_id)?;
     let res = world