diff options
author | Aleksey Kladov <[email protected]> | 2021-01-06 10:54:28 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2021-01-06 12:39:28 +0000 |
commit | f7a15b5cd1df58e46066bbd27c90cb1ad7f9c316 (patch) | |
tree | df2caa99c4558b9f2550420896ec9998566e1d5d /crates/rust-analyzer/src/to_proto.rs | |
parent | c3104466596e85d7fa43b8e3ac015bcabd08fcce (diff) |
More maintainable config
Rather than eagerly converting JSON, we losslessly keep it as is, and
change the shape of user-submitted data at the last moment.
This also allows us to remove a bunch of wrong Defaults
Diffstat (limited to 'crates/rust-analyzer/src/to_proto.rs')
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index e0413ec06..a5f7e3af7 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -818,7 +818,7 @@ pub(crate) fn runnable( | |||
818 | file_id: FileId, | 818 | file_id: FileId, |
819 | runnable: Runnable, | 819 | runnable: Runnable, |
820 | ) -> Result<lsp_ext::Runnable> { | 820 | ) -> Result<lsp_ext::Runnable> { |
821 | let config = &snap.config.runnables; | 821 | let config = snap.config.runnables(); |
822 | let spec = CargoTargetSpec::for_file(snap, file_id)?; | 822 | let spec = CargoTargetSpec::for_file(snap, file_id)?; |
823 | let workspace_root = spec.as_ref().map(|it| it.workspace_root.clone()); | 823 | let workspace_root = spec.as_ref().map(|it| it.workspace_root.clone()); |
824 | let target = spec.as_ref().map(|s| s.target.clone()); | 824 | let target = spec.as_ref().map(|s| s.target.clone()); |
@@ -833,9 +833,9 @@ pub(crate) fn runnable( | |||
833 | kind: lsp_ext::RunnableKind::Cargo, | 833 | kind: lsp_ext::RunnableKind::Cargo, |
834 | args: lsp_ext::CargoRunnable { | 834 | args: lsp_ext::CargoRunnable { |
835 | workspace_root: workspace_root.map(|it| it.into()), | 835 | workspace_root: workspace_root.map(|it| it.into()), |
836 | override_cargo: config.override_cargo.clone(), | 836 | override_cargo: config.override_cargo, |
837 | cargo_args, | 837 | cargo_args, |
838 | cargo_extra_args: config.cargo_extra_args.clone(), | 838 | cargo_extra_args: config.cargo_extra_args, |
839 | executable_args, | 839 | executable_args, |
840 | expect_test: None, | 840 | expect_test: None, |
841 | }, | 841 | }, |