aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock36
-rw-r--r--crates/gen_lsp_server/Cargo.toml2
-rw-r--r--crates/gen_lsp_server/src/lib.rs6
-rw-r--r--crates/gen_lsp_server/src/msg.rs2
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/src/caps.rs2
-rw-r--r--crates/ra_lsp_server/src/conv.rs30
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs2
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs2
-rw-r--r--crates/ra_lsp_server/src/req.rs4
-rw-r--r--crates/ra_lsp_server/src/server_world.rs2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/main.rs2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/support.rs2
13 files changed, 47 insertions, 47 deletions
diff --git a/Cargo.lock b/Cargo.lock
index cfb081e18..504a5633f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -337,8 +337,8 @@ version = "0.1.0"
337dependencies = [ 337dependencies = [
338 "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", 338 "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
339 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 339 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
340 "languageserver-types 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)",
341 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 340 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
341 "lsp-types 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
342 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", 342 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
343 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", 343 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
344] 344]
@@ -412,21 +412,6 @@ version = "0.1.3"
412source = "registry+https://github.com/rust-lang/crates.io-index" 412source = "registry+https://github.com/rust-lang/crates.io-index"
413 413
414[[package]] 414[[package]]
415name = "languageserver-types"
416version = "0.53.1"
417source = "registry+https://github.com/rust-lang/crates.io-index"
418dependencies = [
419 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
420 "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
421 "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
422 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
423 "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
424 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
425 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
426 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
427]
428
429[[package]]
430name = "lazy_static" 415name = "lazy_static"
431version = "1.2.0" 416version = "1.2.0"
432source = "registry+https://github.com/rust-lang/crates.io-index" 417source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -454,6 +439,21 @@ dependencies = [
454] 439]
455 440
456[[package]] 441[[package]]
442name = "lsp-types"
443version = "0.54.0"
444source = "registry+https://github.com/rust-lang/crates.io-index"
445dependencies = [
446 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
447 "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
448 "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
449 "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
450 "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
451 "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
452 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
453 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
454]
455
456[[package]]
457name = "maplit" 457name = "maplit"
458version = "1.0.1" 458version = "1.0.1"
459source = "registry+https://github.com/rust-lang/crates.io-index" 459source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -730,8 +730,8 @@ dependencies = [
730 "flexi_logger 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", 730 "flexi_logger 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
731 "gen_lsp_server 0.1.0", 731 "gen_lsp_server 0.1.0",
732 "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 732 "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
733 "languageserver-types 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)",
734 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 733 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
734 "lsp-types 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
735 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 735 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
736 "ra_arena 0.1.0", 736 "ra_arena 0.1.0",
737 "ra_ide_api 0.1.0", 737 "ra_ide_api 0.1.0",
@@ -1526,11 +1526,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1526"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" 1526"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
1527"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" 1527"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
1528"checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f" 1528"checksum join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc7a5290e8c2606ce2be49f456d50f69173cb96d1541e4f66e34ac8b331a98f"
1529"checksum languageserver-types 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7c01845f71b8b3b3557a8179af4434a4b2570829da12371f05272d28183a06ce"
1530"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" 1529"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
1531"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" 1530"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"
1532"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" 1531"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
1533"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" 1532"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
1533"checksum lsp-types 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a252cc2be87d9329dd91c505a951996b3263582ba304870960faaae77b642183"
1534"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" 1534"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
1535"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 1535"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
1536"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9" 1536"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index a421a3e0b..041151741 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]
11languageserver-types = "0.53.1" 11lsp-types = "0.54.0"
12log = "0.4.3" 12log = "0.4.3"
13failure = "0.1.4" 13failure = "0.1.4"
14serde_json = "1.0.34" 14serde_json = "1.0.34"
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs
index 16ac799ac..edbdda6c8 100644
--- a/crates/gen_lsp_server/src/lib.rs
+++ b/crates/gen_lsp_server/src/lib.rs
@@ -6,12 +6,12 @@
6//! 6//!
7//! ```no_run 7//! ```no_run
8//! extern crate gen_lsp_server; 8//! extern crate gen_lsp_server;
9//! extern crate languageserver_types; 9//! extern crate lsp_types;
10//! extern crate failure; 10//! extern crate failure;
11//! extern crate crossbeam_channel; 11//! extern crate crossbeam_channel;
12//! 12//!
13//! use crossbeam_channel::{Sender, Receiver}; 13//! use crossbeam_channel::{Sender, Receiver};
14//! use languageserver_types::{ServerCapabilities, InitializeParams, request::{GotoDefinition, GotoDefinitionResponse}}; 14//! use lsp_types::{ServerCapabilities, InitializeParams, request::{GotoDefinition, GotoDefinitionResponse}};
15//! use gen_lsp_server::{run_server, stdio_transport, handle_shutdown, RawMessage, RawResponse}; 15//! use gen_lsp_server::{run_server, stdio_transport, handle_shutdown, RawMessage, RawResponse};
16//! 16//!
17//! fn main() -> Result<(), failure::Error> { 17//! fn main() -> Result<(), failure::Error> {
@@ -65,7 +65,7 @@ mod msg;
65mod stdio; 65mod stdio;
66 66
67use crossbeam_channel::{Receiver, Sender}; 67use crossbeam_channel::{Receiver, Sender};
68use languageserver_types::{ 68use lsp_types::{
69 notification::{Exit, Initialized}, 69 notification::{Exit, Initialized},
70 request::{Initialize, Shutdown}, 70 request::{Initialize, Shutdown},
71 InitializeParams, InitializeResult, ServerCapabilities, 71 InitializeParams, InitializeResult, ServerCapabilities,
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs
index 94bef374c..818111fe7 100644
--- a/crates/gen_lsp_server/src/msg.rs
+++ b/crates/gen_lsp_server/src/msg.rs
@@ -1,6 +1,6 @@
1use std::io::{BufRead, Write}; 1use std::io::{BufRead, Write};
2 2
3use languageserver_types::{notification::Notification, request::Request}; 3use lsp_types::{notification::Notification, request::Request};
4use serde::{Deserialize, Serialize}; 4use serde::{Deserialize, Serialize};
5use serde_json::{from_str, from_value, to_string, to_value, Value}; 5use serde_json::{from_str, from_value, to_string, to_value, Value};
6use failure::{bail, format_err}; 6use failure::{bail, format_err};
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 7e307eb1c..0557897fd 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -17,7 +17,7 @@ crossbeam-channel = "0.3.5"
17flexi_logger = "0.10.0" 17flexi_logger = "0.10.0"
18log = "0.4.3" 18log = "0.4.3"
19url_serde = "0.2.0" 19url_serde = "0.2.0"
20languageserver-types = "0.53.1" 20lsp-types = "0.54.0"
21walkdir = "2.2.7" 21walkdir = "2.2.7"
22im = "12.0.0" 22im = "12.0.0"
23cargo_metadata = "0.6.0" 23cargo_metadata = "0.6.0"
diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index be6a6ead6..bca079d65 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -1,4 +1,4 @@
1use languageserver_types::{ 1use lsp_types::{
2 CodeActionProviderCapability, CodeLensOptions, CompletionOptions, DocumentOnTypeFormattingOptions, 2 CodeActionProviderCapability, CodeLensOptions, CompletionOptions, DocumentOnTypeFormattingOptions,
3 ExecuteCommandOptions, FoldingRangeProviderCapability, RenameOptions, RenameProviderCapability, 3 ExecuteCommandOptions, FoldingRangeProviderCapability, RenameOptions, RenameProviderCapability,
4 ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability, TextDocumentSyncKind, 4 ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability, TextDocumentSyncKind,
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 687663d8a..6e187d49e 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -1,4 +1,4 @@
1use languageserver_types::{ 1use lsp_types::{
2 self, CreateFile, DocumentChangeOperation, DocumentChanges, InsertTextFormat, Location, LocationLink, 2 self, CreateFile, DocumentChangeOperation, DocumentChanges, InsertTextFormat, Location, LocationLink,
3 Position, Range, RenameFile, ResourceOp, SymbolKind, TextDocumentEdit, TextDocumentIdentifier, 3 Position, Range, RenameFile, ResourceOp, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
4 TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier, 4 TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
@@ -51,10 +51,10 @@ impl Conv for SyntaxKind {
51} 51}
52 52
53impl Conv for CompletionItemKind { 53impl Conv for CompletionItemKind {
54 type Output = ::languageserver_types::CompletionItemKind; 54 type Output = ::lsp_types::CompletionItemKind;
55 55
56 fn conv(self) -> <Self as Conv>::Output { 56 fn conv(self) -> <Self as Conv>::Output {
57 use languageserver_types::CompletionItemKind::*; 57 use lsp_types::CompletionItemKind::*;
58 match self { 58 match self {
59 CompletionItemKind::Keyword => Keyword, 59 CompletionItemKind::Keyword => Keyword,
60 CompletionItemKind::Snippet => Snippet, 60 CompletionItemKind::Snippet => Snippet,
@@ -75,10 +75,10 @@ impl Conv for CompletionItemKind {
75} 75}
76 76
77impl Conv for CompletionItem { 77impl Conv for CompletionItem {
78 type Output = ::languageserver_types::CompletionItem; 78 type Output = ::lsp_types::CompletionItem;
79 79
80 fn conv(self) -> <Self as Conv>::Output { 80 fn conv(self) -> <Self as Conv>::Output {
81 let mut res = ::languageserver_types::CompletionItem { 81 let mut res = ::lsp_types::CompletionItem {
82 label: self.label().to_string(), 82 label: self.label().to_string(),
83 detail: self.detail().map(|it| it.to_string()), 83 detail: self.detail().map(|it| it.to_string()),
84 filter_text: Some(self.lookup().to_string()), 84 filter_text: Some(self.lookup().to_string()),
@@ -148,9 +148,9 @@ impl ConvWith for Range {
148 148
149impl ConvWith for TextEdit { 149impl ConvWith for TextEdit {
150 type Ctx = LineIndex; 150 type Ctx = LineIndex;
151 type Output = Vec<languageserver_types::TextEdit>; 151 type Output = Vec<lsp_types::TextEdit>;
152 152
153 fn conv_with(self, line_index: &LineIndex) -> Vec<languageserver_types::TextEdit> { 153 fn conv_with(self, line_index: &LineIndex) -> Vec<lsp_types::TextEdit> {
154 self.as_atoms() 154 self.as_atoms()
155 .into_iter() 155 .into_iter()
156 .map_conv_with(line_index) 156 .map_conv_with(line_index)
@@ -160,10 +160,10 @@ impl ConvWith for TextEdit {
160 160
161impl<'a> ConvWith for &'a AtomTextEdit { 161impl<'a> ConvWith for &'a AtomTextEdit {
162 type Ctx = LineIndex; 162 type Ctx = LineIndex;
163 type Output = languageserver_types::TextEdit; 163 type Output = lsp_types::TextEdit;
164 164
165 fn conv_with(self, line_index: &LineIndex) -> languageserver_types::TextEdit { 165 fn conv_with(self, line_index: &LineIndex) -> lsp_types::TextEdit {
166 languageserver_types::TextEdit { 166 lsp_types::TextEdit {
167 range: self.delete.conv_with(line_index), 167 range: self.delete.conv_with(line_index),
168 new_text: self.insert.clone(), 168 new_text: self.insert.clone(),
169 } 169 }
@@ -324,7 +324,7 @@ impl TryConvWith for FileSystemEdit {
324 fn try_conv_with(self, world: &ServerWorld) -> Result<ResourceOp> { 324 fn try_conv_with(self, world: &ServerWorld) -> Result<ResourceOp> {
325 let res = match self { 325 let res = match self {
326 FileSystemEdit::CreateFile { source_root, path } => { 326 FileSystemEdit::CreateFile { source_root, path } => {
327 let uri = world.path_to_uri(source_root, &path)?.to_string(); 327 let uri = world.path_to_uri(source_root, &path)?;
328 ResourceOp::Create(CreateFile { uri, options: None }) 328 ResourceOp::Create(CreateFile { uri, options: None })
329 } 329 }
330 FileSystemEdit::MoveFile { 330 FileSystemEdit::MoveFile {
@@ -332,8 +332,8 @@ impl TryConvWith for FileSystemEdit {
332 dst_source_root, 332 dst_source_root,
333 dst_path, 333 dst_path,
334 } => { 334 } => {
335 let old_uri = world.file_id_to_uri(src)?.to_string(); 335 let old_uri = world.file_id_to_uri(src)?;
336 let new_uri = world.path_to_uri(dst_source_root, &dst_path)?.to_string(); 336 let new_uri = world.path_to_uri(dst_source_root, &dst_path)?;
337 ResourceOp::Rename(RenameFile { 337 ResourceOp::Rename(RenameFile {
338 old_uri, 338 old_uri,
339 new_uri, 339 new_uri,
@@ -361,7 +361,7 @@ pub fn to_location_link(
361 // line index for original range file 361 // line index for original range file
362 line_index: &LineIndex, 362 line_index: &LineIndex,
363) -> Result<LocationLink> { 363) -> Result<LocationLink> {
364 let url = target.info.file_id().try_conv_with(world)?; 364 let target_uri = target.info.file_id().try_conv_with(world)?;
365 let tgt_line_index = world.analysis().file_line_index(target.info.file_id()); 365 let tgt_line_index = world.analysis().file_line_index(target.info.file_id());
366 366
367 let target_range = target.info.full_range().conv_with(&tgt_line_index); 367 let target_range = target.info.full_range().conv_with(&tgt_line_index);
@@ -374,7 +374,7 @@ pub fn to_location_link(
374 374
375 let res = LocationLink { 375 let res = LocationLink {
376 origin_selection_range: Some(target.range.conv_with(line_index)), 376 origin_selection_range: Some(target.range.conv_with(line_index)),
377 target_uri: url.to_string(), 377 target_uri,
378 target_range, 378 target_range,
379 target_selection_range: Some(target_selection_range), 379 target_selection_range: Some(target_selection_range),
380 }; 380 };
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 03c834dbc..19fd294e0 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -9,7 +9,7 @@ use failure_derive::Fail;
9use gen_lsp_server::{ 9use gen_lsp_server::{
10 handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, 10 handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse,
11}; 11};
12use languageserver_types::NumberOrString; 12use lsp_types::NumberOrString;
13use ra_ide_api::{Canceled, FileId, LibraryData}; 13use ra_ide_api::{Canceled, FileId, LibraryData};
14use ra_vfs::VfsTask; 14use ra_vfs::VfsTask;
15use rayon; 15use rayon;
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 7326a727d..11a705200 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -1,7 +1,7 @@
1use std::collections::HashMap; 1use std::collections::HashMap;
2 2
3use gen_lsp_server::ErrorCode; 3use gen_lsp_server::ErrorCode;
4use languageserver_types::{ 4use lsp_types::{
5 CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity, 5 CodeActionResponse, CodeLens, Command, Diagnostic, DiagnosticSeverity,
6 DocumentFormattingParams, DocumentHighlight, DocumentSymbol, Documentation, FoldingRange, 6 DocumentFormattingParams, DocumentHighlight, DocumentSymbol, Documentation, FoldingRange,
7 FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent, 7 FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent,
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index c2b16725b..156cf9641 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -1,9 +1,9 @@
1use languageserver_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; 4use url_serde;
5 5
6pub use languageserver_types::{ 6pub use lsp_types::{
7 notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens, CodeLensParams, 7 notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens, CodeLensParams,
8 CompletionParams, CompletionResponse, DocumentOnTypeFormattingParams, DocumentSymbolParams, 8 CompletionParams, CompletionResponse, DocumentOnTypeFormattingParams, DocumentSymbolParams,
9 DocumentSymbolResponse, ExecuteCommandParams, Hover, InitializeResult, 9 DocumentSymbolResponse, ExecuteCommandParams, Hover, InitializeResult,
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index d5dbf999f..c24ded9f9 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -3,7 +3,7 @@ use std::{
3 sync::Arc, 3 sync::Arc,
4}; 4};
5 5
6use languageserver_types::Url; 6use lsp_types::Url;
7use ra_ide_api::{ 7use ra_ide_api::{
8 Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, 8 Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData,
9 SourceRootId 9 SourceRootId
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 02d62a259..8b5c43a09 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -5,7 +5,7 @@ use std::{
5 time::Instant, 5 time::Instant,
6}; 6};
7 7
8use languageserver_types::{ 8use lsp_types::{
9 CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range, 9 CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range,
10}; 10};
11use ra_lsp_server::req::{ 11use ra_lsp_server::req::{
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 46107b6b6..57a8b4f4d 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -9,7 +9,7 @@ use std::{
9use crossbeam_channel::{after, select, Receiver}; 9use crossbeam_channel::{after, select, Receiver};
10use flexi_logger::Logger; 10use flexi_logger::Logger;
11use gen_lsp_server::{RawMessage, RawNotification, RawRequest}; 11use gen_lsp_server::{RawMessage, RawNotification, RawRequest};
12use languageserver_types::{ 12use lsp_types::{
13 notification::DidOpenTextDocument, 13 notification::DidOpenTextDocument,
14 request::{Request, Shutdown}, 14 request::{Request, Shutdown},
15 DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, 15 DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url,