diff options
author | Aleksey Kladov <[email protected]> | 2020-02-18 11:15:12 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-02-18 11:15:12 +0000 |
commit | b6740060f60fa016ac1c3d420c9ac919d31f6997 (patch) | |
tree | c951b508d20622c23fbb4ff17e9fdfd18121f75e /crates/ra_lsp_server/src | |
parent | 93b969003d0a9448d4207d9d5df9dde63f9444be (diff) |
Refactor
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/cargo_target_spec.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_lsp_server/src/cargo_target_spec.rs b/crates/ra_lsp_server/src/cargo_target_spec.rs index 5fd1e7b6b..56d3f0de4 100644 --- a/crates/ra_lsp_server/src/cargo_target_spec.rs +++ b/crates/ra_lsp_server/src/cargo_target_spec.rs | |||
@@ -6,11 +6,9 @@ use ra_project_model::{self, ProjectWorkspace, TargetKind}; | |||
6 | use crate::{world::WorldSnapshot, Result}; | 6 | use crate::{world::WorldSnapshot, Result}; |
7 | 7 | ||
8 | pub(crate) fn runnable_args( | 8 | pub(crate) fn runnable_args( |
9 | world: &WorldSnapshot, | 9 | spec: Option<CargoTargetSpec>, |
10 | file_id: FileId, | ||
11 | kind: &RunnableKind, | 10 | kind: &RunnableKind, |
12 | ) -> Result<Vec<String>> { | 11 | ) -> Result<Vec<String>> { |
13 | let spec = CargoTargetSpec::for_file(world, file_id)?; | ||
14 | let mut res = Vec::new(); | 12 | let mut res = Vec::new(); |
15 | match kind { | 13 | match kind { |
16 | RunnableKind::Test { test_id } => { | 14 | RunnableKind::Test { test_id } => { |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index ae51141cb..833f31d96 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -921,7 +921,8 @@ fn to_lsp_runnable( | |||
921 | file_id: FileId, | 921 | file_id: FileId, |
922 | runnable: Runnable, | 922 | runnable: Runnable, |
923 | ) -> Result<req::Runnable> { | 923 | ) -> Result<req::Runnable> { |
924 | let args = runnable_args(world, file_id, &runnable.kind)?; | 924 | let spec: Option<CargoTargetSpec> = CargoTargetSpec::for_file(world, file_id)?; |
925 | let args = runnable_args(spec, &runnable.kind)?; | ||
925 | let line_index = world.analysis().file_line_index(file_id)?; | 926 | let line_index = world.analysis().file_line_index(file_id)?; |
926 | let label = match &runnable.kind { | 927 | let label = match &runnable.kind { |
927 | RunnableKind::Test { test_id } => format!("test {}", test_id), | 928 | RunnableKind::Test { test_id } => format!("test {}", test_id), |