user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update lsp

Browse source
This commit is contained in:
Aleksey Kladov 2019-08-17 21:34:31 +03:00
parent 5a2a97c7e8
commit 64ecba4f15
5 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/gen_lsp_server/Cargo.toml
View file

@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
description = "Generic LSP server scaffold."
[dependencies]
lsp-types = "0.59.0"
lsp-types = "0.60.0"
log = "0.4.3"
serde_json = "1.0.34"
serde = { version = "1.0.83", features = ["derive"] }

3
crates/ra_lsp_server/Cargo.toml
View file

@ -12,8 +12,7 @@ serde = { version = "1.0.83", features = ["derive"] }
crossbeam-channel = "0.3.5"
flexi_logger = "0.14.0"
log = "0.4.3"
url_serde = "0.2.0"
lsp-types = { version = "0.59.0", features = ["proposed"] }
lsp-types = { version = "0.60.0", features = ["proposed"] }
rustc-hash = "1.0"
parking_lot = "0.9.0"

3
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -16,7 +16,6 @@ use ra_syntax::{AstNode, SyntaxKind, TextRange, TextUnit};
use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use serde_json::to_value;
use url_serde::Ser;
use crate::{
cargo_target_spec::{runnable_args, CargoTargetSpec},
@ -736,7 +735,7 @@ pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Re
title,
command: "rust-analyzer.showReferences".into(),
arguments: Some(vec![
to_value(&Ser::new(&lens_params.text_document.uri)).unwrap(),
to_value(&lens_params.text_document.uri).unwrap(),
to_value(code_lens.range.start).unwrap(),
to_value(locations).unwrap(),
]),

2
crates/ra_lsp_server/src/req.rs
View file

@ -1,7 +1,6 @@
use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url};
use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use url_serde;
pub use lsp_types::{
notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens,
@ -98,7 +97,6 @@ impl Notification for PublishDecorations {
#[derive(Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct PublishDecorationsParams {
#[serde(with = "url_serde")]
pub uri: Url,
pub decorations: Vec<Decoration>,
}