diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-19 23:02:11 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-19 23:02:11 +0000 |
commit | dbb62b5baa36783bbca06f09c77794fce3ceff0c (patch) | |
tree | 1437e92c1344b6936112530f5ea103f981c6c0e2 /crates/ra_lsp_server | |
parent | ef1e107df147a82b74089ab9797ce35effe24e5e (diff) | |
parent | 93cf39d96836056d63401099a98e7a511231a0d9 (diff) |
Merge #294
294: Bump languageserver-types to 0.53.0 to support LSP 3.14.0 r=matklad a=kjeremy
See: https://microsoft.github.io/language-server-protocol/specification#version_3_14_0
Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 30a8d35cd..ce4f79d46 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -18,7 +18,7 @@ crossbeam-channel = "0.2.4" | |||
18 | flexi_logger = "0.10.0" | 18 | flexi_logger = "0.10.0" |
19 | log = "0.4.3" | 19 | log = "0.4.3" |
20 | url_serde = "0.2.0" | 20 | url_serde = "0.2.0" |
21 | languageserver-types = "0.51.0" | 21 | languageserver-types = "0.53.0" |
22 | walkdir = "2.2.0" | 22 | walkdir = "2.2.0" |
23 | im = "12.0.0" | 23 | im = "12.0.0" |
24 | cargo_metadata = "0.6.0" | 24 | cargo_metadata = "0.6.0" |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 21ca22c5c..acca480c7 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -6,7 +6,7 @@ use languageserver_types::{ | |||
6 | DiagnosticSeverity, DocumentSymbol, Documentation, FoldingRange, FoldingRangeKind, | 6 | DiagnosticSeverity, DocumentSymbol, Documentation, FoldingRange, FoldingRangeKind, |
7 | FoldingRangeParams, InsertTextFormat, Location, MarkupContent, MarkupKind, MarkedString, Position, | 7 | FoldingRangeParams, InsertTextFormat, Location, MarkupContent, MarkupKind, MarkedString, Position, |
8 | PrepareRenameResponse, RenameParams, SymbolInformation, TextDocumentIdentifier, TextEdit, | 8 | PrepareRenameResponse, RenameParams, SymbolInformation, TextDocumentIdentifier, TextEdit, |
9 | WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents, | 9 | WorkspaceEdit, ParameterInformation, ParameterLabel, SignatureInformation, Hover, HoverContents, |
10 | }; | 10 | }; |
11 | use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition}; | 11 | use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition}; |
12 | use ra_syntax::{TextUnit, text_utils::intersect}; | 12 | use ra_syntax::{TextUnit, text_utils::intersect}; |
@@ -475,7 +475,7 @@ pub fn handle_signature_help( | |||
475 | .params | 475 | .params |
476 | .iter() | 476 | .iter() |
477 | .map(|param| ParameterInformation { | 477 | .map(|param| ParameterInformation { |
478 | label: param.clone(), | 478 | label: ParameterLabel::Simple(param.clone()), |
479 | documentation: None, | 479 | documentation: None, |
480 | }) | 480 | }) |
481 | .collect(); | 481 | .collect(); |