rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Apply suggestions from @kjeremy review

Browse Source
This commit is contained in:
vsrs
2020-06-03 16:39:32 +03:00
parent 92cfc0f2a1
commit e35418ceb9
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/rust-analyzer/src/lsp_ext.rs
View File

@@ -271,26 +271,24 @@ impl Request for HoverRequest {
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
pub struct Hover {
pub contents: lsp_types::HoverContents,
#[serde(skip_serializing_if = "Option::is_none")]
pub range: Option<Range>,
#[serde(flatten)]
pub hover: lsp_types::Hover,
#[serde(skip_serializing_if = "Option::is_none")]
pub actions: Option<Vec<CommandLinkGroup>>,
}
#[derive(Debug, PartialEq, Eq, Clone, Default, Deserialize, Serialize)]
#[derive(Debug, PartialEq, Clone, Default, Deserialize, Serialize)]
pub struct CommandLinkGroup {
#[serde(skip_serializing_if = "Option::is_none")]
pub title: Option<String>,
pub commands: Vec<CommandLink>,
}
// LSP v3.15 Command does not have a `tooltip` field, vscode supports one.
#[derive(Debug, PartialEq, Eq, Clone, Default, Deserialize, Serialize)]
#[derive(Debug, PartialEq, Clone, Default, Deserialize, Serialize)]
pub struct CommandLink {
pub title: String,
pub command: String,
#[serde(flatten)]
pub command: lsp_types::Command,
#[serde(skip_serializing_if = "Option::is_none")]
pub tooltip: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub arguments: Option<Vec<serde_json::Value>>,
}