diff options
author | Aleksey Kladov <[email protected]> | 2019-08-17 19:34:31 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-08-17 20:21:59 +0100 |
commit | 64ecba4f15bf178fb795174cffc96dda2d46a8d1 (patch) | |
tree | 77f7a2671785bf17fdb1dbadc329f859465d8c50 /crates/ra_lsp_server | |
parent | 5a2a97c7e8cfac690a00505d8644be30f7ee863a (diff) |
update lsp
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 3 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 3 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/req.rs | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index c282d6db8..2c69a6993 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -12,8 +12,7 @@ serde = { version = "1.0.83", features = ["derive"] } | |||
12 | crossbeam-channel = "0.3.5" | 12 | crossbeam-channel = "0.3.5" |
13 | flexi_logger = "0.14.0" | 13 | flexi_logger = "0.14.0" |
14 | log = "0.4.3" | 14 | log = "0.4.3" |
15 | url_serde = "0.2.0" | 15 | lsp-types = { version = "0.60.0", features = ["proposed"] } |
16 | lsp-types = { version = "0.59.0", features = ["proposed"] } | ||
17 | rustc-hash = "1.0" | 16 | rustc-hash = "1.0" |
18 | parking_lot = "0.9.0" | 17 | parking_lot = "0.9.0" |
19 | 18 | ||
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index a3d3f167c..b465707f8 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -16,7 +16,6 @@ use ra_syntax::{AstNode, SyntaxKind, TextRange, TextUnit}; | |||
16 | use rustc_hash::FxHashMap; | 16 | use rustc_hash::FxHashMap; |
17 | use serde::{Deserialize, Serialize}; | 17 | use serde::{Deserialize, Serialize}; |
18 | use serde_json::to_value; | 18 | use serde_json::to_value; |
19 | use url_serde::Ser; | ||
20 | 19 | ||
21 | use crate::{ | 20 | use crate::{ |
22 | cargo_target_spec::{runnable_args, CargoTargetSpec}, | 21 | cargo_target_spec::{runnable_args, CargoTargetSpec}, |
@@ -736,7 +735,7 @@ pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Re | |||
736 | title, | 735 | title, |
737 | command: "rust-analyzer.showReferences".into(), | 736 | command: "rust-analyzer.showReferences".into(), |
738 | arguments: Some(vec![ | 737 | arguments: Some(vec![ |
739 | to_value(&Ser::new(&lens_params.text_document.uri)).unwrap(), | 738 | to_value(&lens_params.text_document.uri).unwrap(), |
740 | to_value(code_lens.range.start).unwrap(), | 739 | to_value(code_lens.range.start).unwrap(), |
741 | to_value(locations).unwrap(), | 740 | to_value(locations).unwrap(), |
742 | ]), | 741 | ]), |
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs index b2f3c509d..1b23f0c3d 100644 --- a/crates/ra_lsp_server/src/req.rs +++ b/crates/ra_lsp_server/src/req.rs | |||
@@ -1,7 +1,6 @@ | |||
1 | use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url}; | 1 | use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url}; |
2 | use rustc_hash::FxHashMap; | 2 | use rustc_hash::FxHashMap; |
3 | use serde::{Deserialize, Serialize}; | 3 | use serde::{Deserialize, Serialize}; |
4 | use url_serde; | ||
5 | 4 | ||
6 | pub use lsp_types::{ | 5 | pub use lsp_types::{ |
7 | notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens, | 6 | notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens, |
@@ -98,7 +97,6 @@ impl Notification for PublishDecorations { | |||
98 | #[derive(Serialize, Debug)] | 97 | #[derive(Serialize, Debug)] |
99 | #[serde(rename_all = "camelCase")] | 98 | #[serde(rename_all = "camelCase")] |
100 | pub struct PublishDecorationsParams { | 99 | pub struct PublishDecorationsParams { |
101 | #[serde(with = "url_serde")] | ||
102 | pub uri: Url, | 100 | pub uri: Url, |
103 | pub decorations: Vec<Decoration>, | 101 | pub decorations: Vec<Decoration>, |
104 | } | 102 | } |