diff options
| author | Aleksey Kladov <[email protected]> | 2020-07-11 10:46:31 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2020-07-11 10:53:24 +0100 |
| commit | 0f0c5081c0702543cd52c94cd43e08e40910354b (patch) | |
| tree | 45fbf62ae954ae04354672a51d0951f549630841 /crates | |
| parent | 0366a85052904c5c6efa3b3ecddc35dce85337c4 (diff) | |
Make sure there are no commands in code actions
Diffstat (limited to 'crates')
8 files changed, 3 insertions, 9 deletions
diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs index b1b222deb..1b1e670c1 100644 --- a/crates/rust-analyzer/src/diagnostics/to_proto.rs +++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs | |||
| @@ -118,7 +118,6 @@ fn map_rust_child_diagnostic( | |||
| 118 | changes: Some(edit_map), | 118 | changes: Some(edit_map), |
| 119 | document_changes: None, | 119 | document_changes: None, |
| 120 | }), | 120 | }), |
| 121 | command: None, | ||
| 122 | }) | 121 | }) |
| 123 | } | 122 | } |
| 124 | } | 123 | } |
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index 8ce6e1c71..d39dceae0 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs | |||
| @@ -762,7 +762,6 @@ fn handle_fixes( | |||
| 762 | group: None, | 762 | group: None, |
| 763 | kind: Some(lsp_types::code_action_kind::QUICKFIX.into()), | 763 | kind: Some(lsp_types::code_action_kind::QUICKFIX.into()), |
| 764 | edit: Some(edit), | 764 | edit: Some(edit), |
| 765 | command: None, | ||
| 766 | }; | 765 | }; |
| 767 | res.push(action); | 766 | res.push(action); |
| 768 | } | 767 | } |
diff --git a/crates/rust-analyzer/src/lsp_ext.rs b/crates/rust-analyzer/src/lsp_ext.rs index ba8a0231f..a3e12c046 100644 --- a/crates/rust-analyzer/src/lsp_ext.rs +++ b/crates/rust-analyzer/src/lsp_ext.rs | |||
| @@ -249,8 +249,9 @@ pub struct CodeAction { | |||
| 249 | pub group: Option<String>, | 249 | pub group: Option<String>, |
| 250 | #[serde(skip_serializing_if = "Option::is_none")] | 250 | #[serde(skip_serializing_if = "Option::is_none")] |
| 251 | pub kind: Option<String>, | 251 | pub kind: Option<String>, |
| 252 | #[serde(skip_serializing_if = "Option::is_none")] | 252 | // We don't handle commands on the client-side |
| 253 | pub command: Option<lsp_types::Command>, | 253 | // #[serde(skip_serializing_if = "Option::is_none")] |
| 254 | // pub command: Option<lsp_types::Command>, | ||
| 254 | #[serde(skip_serializing_if = "Option::is_none")] | 255 | #[serde(skip_serializing_if = "Option::is_none")] |
| 255 | pub edit: Option<SnippetWorkspaceEdit>, | 256 | pub edit: Option<SnippetWorkspaceEdit>, |
| 256 | } | 257 | } |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 263f58a00..f6dff1684 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
| @@ -651,7 +651,6 @@ pub(crate) fn unresolved_code_action( | |||
| 651 | group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0), | 651 | group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0), |
| 652 | kind: Some(code_action_kind(assist.id.1)), | 652 | kind: Some(code_action_kind(assist.id.1)), |
| 653 | edit: None, | 653 | edit: None, |
| 654 | command: None, | ||
| 655 | }; | 654 | }; |
| 656 | Ok(res) | 655 | Ok(res) |
| 657 | } | 656 | } |
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/test_data/rustc_unused_variable.txt index 81f180a86..92aea088b 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable.txt +++ b/crates/rust-analyzer/test_data/rustc_unused_variable.txt | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | kind: Some( | 39 | kind: Some( |
| 40 | "quickfix", | 40 | "quickfix", |
| 41 | ), | 41 | ), |
| 42 | command: None, | ||
| 43 | edit: Some( | 42 | edit: Some( |
| 44 | SnippetWorkspaceEdit { | 43 | SnippetWorkspaceEdit { |
| 45 | changes: Some( | 44 | changes: Some( |
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt index d5d78fd80..80cf0d8a5 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt +++ b/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | kind: Some( | 39 | kind: Some( |
| 40 | "quickfix", | 40 | "quickfix", |
| 41 | ), | 41 | ), |
| 42 | command: None, | ||
| 43 | edit: Some( | 42 | edit: Some( |
| 44 | SnippetWorkspaceEdit { | 43 | SnippetWorkspaceEdit { |
| 45 | changes: Some( | 44 | changes: Some( |
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt index 2a7505c59..afe3cb6d8 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt +++ b/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | kind: Some( | 39 | kind: Some( |
| 40 | "quickfix", | 40 | "quickfix", |
| 41 | ), | 41 | ), |
| 42 | command: None, | ||
| 43 | edit: Some( | 42 | edit: Some( |
| 44 | SnippetWorkspaceEdit { | 43 | SnippetWorkspaceEdit { |
| 45 | changes: Some( | 44 | changes: Some( |
diff --git a/crates/rust-analyzer/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/test_data/snap_multi_line_fix.txt index 6eca3ae2f..7814d3543 100644 --- a/crates/rust-analyzer/test_data/snap_multi_line_fix.txt +++ b/crates/rust-analyzer/test_data/snap_multi_line_fix.txt | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | kind: Some( | 54 | kind: Some( |
| 55 | "quickfix", | 55 | "quickfix", |
| 56 | ), | 56 | ), |
| 57 | command: None, | ||
| 58 | edit: Some( | 57 | edit: Some( |
| 59 | SnippetWorkspaceEdit { | 58 | SnippetWorkspaceEdit { |
| 60 | changes: Some( | 59 | changes: Some( |