aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-08-17 20:23:16 +0100
committerGitHub <[email protected]>2019-08-17 20:23:16 +0100
commit2bac1bdf174a053f0727e982f0f92d068ef3c208 (patch)
tree77f7a2671785bf17fdb1dbadc329f859465d8c50 /crates
parent5a2a97c7e8cfac690a00505d8644be30f7ee863a (diff)
parent64ecba4f15bf178fb795174cffc96dda2d46a8d1 (diff)
Merge #1695
1695: update lsp r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/gen_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/Cargo.toml3
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs3
-rw-r--r--crates/ra_lsp_server/src/req.rs2
4 files changed, 3 insertions, 7 deletions
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index d0ca19f52..7011aa1bf 100644
--- a/crates/gen_lsp_server/Cargo.toml
+++ b/crates/gen_lsp_server/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
8description = "Generic LSP server scaffold." 8description = "Generic LSP server scaffold."
9 9
10[dependencies] 10[dependencies]
11lsp-types = "0.59.0" 11lsp-types = "0.60.0"
12log = "0.4.3" 12log = "0.4.3"
13serde_json = "1.0.34" 13serde_json = "1.0.34"
14serde = { version = "1.0.83", features = ["derive"] } 14serde = { version = "1.0.83", features = ["derive"] }
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"] }
12crossbeam-channel = "0.3.5" 12crossbeam-channel = "0.3.5"
13flexi_logger = "0.14.0" 13flexi_logger = "0.14.0"
14log = "0.4.3" 14log = "0.4.3"
15url_serde = "0.2.0" 15lsp-types = { version = "0.60.0", features = ["proposed"] }
16lsp-types = { version = "0.59.0", features = ["proposed"] }
17rustc-hash = "1.0" 16rustc-hash = "1.0"
18parking_lot = "0.9.0" 17parking_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};
16use rustc_hash::FxHashMap; 16use rustc_hash::FxHashMap;
17use serde::{Deserialize, Serialize}; 17use serde::{Deserialize, Serialize};
18use serde_json::to_value; 18use serde_json::to_value;
19use url_serde::Ser;
20 19
21use crate::{ 20use 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 @@
1use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url}; 1use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url};
2use rustc_hash::FxHashMap; 2use rustc_hash::FxHashMap;
3use serde::{Deserialize, Serialize}; 3use serde::{Deserialize, Serialize};
4use url_serde;
5 4
6pub use lsp_types::{ 5pub 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")]
100pub struct PublishDecorationsParams { 99pub 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}