aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-04 22:17:11 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-04 22:17:11 +0100
commitc6a6e43372de9530ec7df0f38352466ed107e1a2 (patch)
treee712cc4cf3f4d2d1650b74e4141b58056f26f6c7 /crates/ra_lsp_server
parentcf8e59ddd8762a68495443ecd0c62522c836d3d4 (diff)
parenta394c04bca984165836cc77ca7171cd49a5d437e (diff)
Merge #1484
1484: Update to lsp-types 0.58.0 r=matklad a=kjeremy Fixes CodeActionResponse Co-authored-by: Jeremy Kolb <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs18
2 files changed, 10 insertions, 10 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 4491b8590..2c4b3789e 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -13,7 +13,7 @@ crossbeam-channel = "0.3.5"
13flexi_logger = "0.13.0" 13flexi_logger = "0.13.0"
14log = "0.4.3" 14log = "0.4.3"
15url_serde = "0.2.0" 15url_serde = "0.2.0"
16lsp-types = { version = "0.57.1", features = ["proposed"] } 16lsp-types = { version = "0.58.0", features = ["proposed"] }
17rustc-hash = "1.0" 17rustc-hash = "1.0"
18parking_lot = "0.8.0" 18parking_lot = "0.8.0"
19 19
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index bbbc93b1c..846991f09 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -2,11 +2,11 @@ use std::{fmt::Write as _, io::Write as _};
2 2
3use gen_lsp_server::ErrorCode; 3use gen_lsp_server::ErrorCode;
4use lsp_types::{ 4use lsp_types::{
5 CodeAction, CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity, 5 CodeAction, CodeActionOrCommand, CodeActionResponse, CodeLens, Command, Diagnostic,
6 DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeKind, 6 DiagnosticSeverity, DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange,
7 FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, MarkupKind, Position, 7 FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent,
8 PrepareRenameResponse, Range, RenameParams, SymbolInformation, TextDocumentIdentifier, 8 MarkupKind, Position, PrepareRenameResponse, Range, RenameParams, SymbolInformation,
9 TextEdit, WorkspaceEdit, 9 TextDocumentIdentifier, TextEdit, WorkspaceEdit,
10}; 10};
11use ra_ide_api::{ 11use ra_ide_api::{
12 AssistId, Cancelable, FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo, 12 AssistId, Cancelable, FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo,
@@ -665,7 +665,7 @@ pub fn handle_code_action(
665 665
666 let assists = world.analysis().assists(FileRange { file_id, range })?.into_iter(); 666 let assists = world.analysis().assists(FileRange { file_id, range })?.into_iter();
667 let diagnostics = world.analysis().diagnostics(file_id)?; 667 let diagnostics = world.analysis().diagnostics(file_id)?;
668 let mut res: Vec<CodeAction> = Vec::new(); 668 let mut res = CodeActionResponse::default();
669 669
670 let fixes_from_diagnostics = diagnostics 670 let fixes_from_diagnostics = diagnostics
671 .into_iter() 671 .into_iter()
@@ -689,7 +689,7 @@ pub fn handle_code_action(
689 edit: None, 689 edit: None,
690 command: Some(command), 690 command: Some(command),
691 }; 691 };
692 res.push(action); 692 res.push(CodeActionOrCommand::CodeAction(action));
693 } 693 }
694 694
695 for assist in assists { 695 for assist in assists {
@@ -711,10 +711,10 @@ pub fn handle_code_action(
711 edit: None, 711 edit: None,
712 command: Some(command), 712 command: Some(command),
713 }; 713 };
714 res.push(action); 714 res.push(CodeActionOrCommand::CodeAction(action));
715 } 715 }
716 716
717 Ok(Some(CodeActionResponse::Actions(res))) 717 Ok(Some(res))
718} 718}
719 719
720pub fn handle_code_lens( 720pub fn handle_code_lens(