aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock8
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs14
2 files changed, 11 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 8fa417a8f..d6f526363 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -541,7 +541,7 @@ dependencies = [
541 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", 541 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
542 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", 542 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
543 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 543 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
544 "lsp-types 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", 544 "lsp-types 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
545 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", 545 "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
546 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", 546 "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
547] 547]
@@ -774,7 +774,7 @@ dependencies = [
774 774
775[[package]] 775[[package]]
776name = "lsp-types" 776name = "lsp-types"
777version = "0.58.0" 777version = "0.58.1"
778source = "registry+https://github.com/rust-lang/crates.io-index" 778source = "registry+https://github.com/rust-lang/crates.io-index"
779dependencies = [ 779dependencies = [
780 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 780 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1200,7 +1200,7 @@ dependencies = [
1200 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", 1200 "flexi_logger 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
1201 "gen_lsp_server 0.2.0", 1201 "gen_lsp_server 0.2.0",
1202 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1202 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1203 "lsp-types 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", 1203 "lsp-types 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
1204 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1204 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1205 "ra_arena 0.1.0", 1205 "ra_arena 0.1.0",
1206 "ra_ide_api 0.1.0", 1206 "ra_ide_api 0.1.0",
@@ -2201,7 +2201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2201"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" 2201"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
2202"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" 2202"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
2203"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" 2203"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
2204"checksum lsp-types 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f5845bb113cdb0b809deadf83727d90a6fa1978da7ea5a32034d3ea23bd2736" 2204"checksum lsp-types 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "42c7edac51b6739544453fd33c7ae5e910d1ec4f2d9904cf1990f8f6581e26f5"
2205"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" 2205"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
2206"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 2206"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
2207"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" 2207"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 846991f09..a8d6f7c23 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, CodeActionOrCommand, CodeActionResponse, CodeLens, Command, Diagnostic, 5 CodeAction, CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity,
6 DiagnosticSeverity, DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, 6 DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeKind,
7 FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, 7 FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, MarkupKind, Position,
8 MarkupKind, Position, PrepareRenameResponse, Range, RenameParams, SymbolInformation, 8 PrepareRenameResponse, Range, RenameParams, SymbolInformation, TextDocumentIdentifier,
9 TextDocumentIdentifier, TextEdit, WorkspaceEdit, 9 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,
@@ -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(CodeActionOrCommand::CodeAction(action)); 692 res.push(action.into());
693 } 693 }
694 694
695 for assist in assists { 695 for assist in assists {
@@ -711,7 +711,7 @@ pub fn handle_code_action(
711 edit: None, 711 edit: None,
712 command: Some(command), 712 command: Some(command),
713 }; 713 };
714 res.push(CodeActionOrCommand::CodeAction(action)); 714 res.push(action.into());
715 } 715 }
716 716
717 Ok(Some(res)) 717 Ok(Some(res))