diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-11 17:35:07 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-11 17:35:07 +0000 |
commit | 4444192b05c107a40a5a05ea3c9091ad8f8cbbcc (patch) | |
tree | c9d5c999b9c6ed50e4296305e3c42674c6d3c049 /crates/ra_lsp_server/src/main_loop | |
parent | 1e0bf205eff81f04c0e1e6c208c3489327520c3f (diff) | |
parent | 6c6e6978eb5b1df611bde4677e078704fc3cc4ab (diff) |
Merge #2530
2530: Update lsp-types more r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 409583634..5b64b27cd 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -648,6 +648,7 @@ pub fn handle_code_action( | |||
648 | diagnostics: None, | 648 | diagnostics: None, |
649 | edit: None, | 649 | edit: None, |
650 | command: Some(command), | 650 | command: Some(command), |
651 | is_preferred: None, | ||
651 | }; | 652 | }; |
652 | res.push(action.into()); | 653 | res.push(action.into()); |
653 | } | 654 | } |
@@ -670,6 +671,7 @@ pub fn handle_code_action( | |||
670 | diagnostics: None, | 671 | diagnostics: None, |
671 | edit: None, | 672 | edit: None, |
672 | command: Some(command), | 673 | command: Some(command), |
674 | is_preferred: None, | ||
673 | }; | 675 | }; |
674 | res.push(action.into()); | 676 | res.push(action.into()); |
675 | } | 677 | } |
@@ -828,9 +830,10 @@ pub fn publish_diagnostics( | |||
828 | source: Some("rust-analyzer".to_string()), | 830 | source: Some("rust-analyzer".to_string()), |
829 | message: d.message, | 831 | message: d.message, |
830 | related_information: None, | 832 | related_information: None, |
833 | tags: None, | ||
831 | }) | 834 | }) |
832 | .collect(); | 835 | .collect(); |
833 | Ok(req::PublishDiagnosticsParams { uri, diagnostics }) | 836 | Ok(req::PublishDiagnosticsParams { uri, diagnostics, version: None }) |
834 | } | 837 | } |
835 | 838 | ||
836 | pub fn publish_decorations( | 839 | pub fn publish_decorations( |