aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_lsp_server/Cargo.toml1
-rw-r--r--crates/ra_lsp_server/src/lib.rs4
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs5
-rw-r--r--crates/ra_lsp_server/src/main_loop/mod.rs18
4 files changed, 24 insertions, 4 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 2b3257117..e4fc40a3a 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -8,6 +8,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
8rayon = "1.0.2" 8rayon = "1.0.2"
9relative-path = "0.3.7" 9relative-path = "0.3.7"
10failure = "0.1.2" 10failure = "0.1.2"
11failure_derive = "0.1.2"
11serde_json = "1.0.24" 12serde_json = "1.0.24"
12serde = "1.0.71" 13serde = "1.0.71"
13serde_derive = "1.0.71" 14serde_derive = "1.0.71"
diff --git a/crates/ra_lsp_server/src/lib.rs b/crates/ra_lsp_server/src/lib.rs
index f1b17f282..ce77b2a33 100644
--- a/crates/ra_lsp_server/src/lib.rs
+++ b/crates/ra_lsp_server/src/lib.rs
@@ -12,6 +12,8 @@ extern crate rayon;
12extern crate log; 12extern crate log;
13extern crate cargo_metadata; 13extern crate cargo_metadata;
14extern crate drop_bomb; 14extern crate drop_bomb;
15#[macro_use]
16extern crate failure_derive;
15extern crate im; 17extern crate im;
16extern crate relative_path; 18extern crate relative_path;
17extern crate rustc_hash; 19extern crate rustc_hash;
@@ -34,4 +36,4 @@ pub mod thread_watcher;
34mod vfs; 36mod vfs;
35 37
36pub type Result<T> = ::std::result::Result<T, ::failure::Error>; 38pub type Result<T> = ::std::result::Result<T, ::failure::Error>;
37pub use crate::{caps::server_capabilities, main_loop::main_loop}; 39pub use crate::{caps::server_capabilities, main_loop::main_loop, main_loop::LspError}; \ No newline at end of file
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index f5dff4c80..baf82f3fc 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -7,6 +7,7 @@ use languageserver_types::{
7 InsertTextFormat, Location, Position, SymbolInformation, TextDocumentIdentifier, TextEdit, 7 InsertTextFormat, Location, Position, SymbolInformation, TextDocumentIdentifier, TextEdit,
8 RenameParams, WorkspaceEdit, PrepareRenameResponse 8 RenameParams, WorkspaceEdit, PrepareRenameResponse
9}; 9};
10use gen_lsp_server::ErrorCode;
10use ra_analysis::{FileId, FoldKind, Query, RunnableKind}; 11use ra_analysis::{FileId, FoldKind, Query, RunnableKind};
11use ra_syntax::text_utils::contains_offset_nonstrict; 12use ra_syntax::text_utils::contains_offset_nonstrict;
12use serde_json::to_value; 13use serde_json::to_value;
@@ -16,7 +17,7 @@ use crate::{
16 project_model::TargetKind, 17 project_model::TargetKind,
17 req::{self, Decoration}, 18 req::{self, Decoration},
18 server_world::ServerWorld, 19 server_world::ServerWorld,
19 Result, 20 Result, LspError
20}; 21};
21 22
22pub fn handle_syntax_tree( 23pub fn handle_syntax_tree(
@@ -476,7 +477,7 @@ pub fn handle_rename(
476 let offset = params.position.conv_with(&line_index); 477 let offset = params.position.conv_with(&line_index);
477 478
478 if params.new_name.is_empty() { 479 if params.new_name.is_empty() {
479 return Ok(None); 480 return Err(LspError::new(ErrorCode::InvalidParams as i32, "New Name cannot be empty".into()).into());
480 } 481 }
481 482
482 let refs = world.analysis().find_all_refs(file_id, offset)?; 483 let refs = world.analysis().find_all_refs(file_id, offset)?;
diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index b35ebd38b..aa3cf1dbd 100644
--- a/crates/ra_lsp_server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -23,6 +23,19 @@ use crate::{
23 Result, 23 Result,
24}; 24};
25 25
26#[derive(Debug, Fail)]
27#[fail(display = "Language Server request failed with {}. ({})", code, message)]
28pub struct LspError {
29 pub code: i32,
30 pub message: String,
31}
32
33impl LspError {
34 pub fn new(code: i32, message: String) -> LspError {
35 LspError {code, message}
36 }
37}
38
26#[derive(Debug)] 39#[derive(Debug)]
27enum Task { 40enum Task {
28 Respond(RawResponse), 41 Respond(RawResponse),
@@ -361,7 +374,10 @@ impl<'a> PoolDispatcher<'a> {
361 let resp = match f(world, params) { 374 let resp = match f(world, params) {
362 Ok(resp) => RawResponse::ok::<R>(id, &resp), 375 Ok(resp) => RawResponse::ok::<R>(id, &resp),
363 Err(e) => { 376 Err(e) => {
364 RawResponse::err(id, ErrorCode::InternalError as i32, e.to_string()) 377 match e.downcast::<LspError>() {
378 Ok(lsp_error) => RawResponse::err(id, lsp_error.code, lsp_error.message),
379 Err(e) => RawResponse::err(id, ErrorCode::InternalError as i32, e.to_string())
380 }
365 } 381 }
366 }; 382 };
367 let task = Task::Respond(resp); 383 let task = Task::Respond(resp);