aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-20 09:23:27 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-20 09:23:27 +0000
commitd8c6b8d999079fdd601b07b91fc46f40f17ee4f1 (patch)
treec93deb29365da5ec2326c3fb570066852c380631 /crates
parent9a16cf2bf646a4a881f3f5acbf5582dacc4337bf (diff)
parentb2f2621c1717df3141ae292c303896fb427fd2f7 (diff)
Merge #297
297: Use ContentModified error code r=matklad a=matklad https://github.com/Microsoft/language-server-protocol/commit/25679c2e4b26cb18af8c943319d40d4f3561a340 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/gen_lsp_server/src/msg.rs1
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs
index 1e5384380..22d273d55 100644
--- a/crates/gen_lsp_server/src/msg.rs
+++ b/crates/gen_lsp_server/src/msg.rs
@@ -55,6 +55,7 @@ pub enum ErrorCode {
55 ServerNotInitialized = -32002, 55 ServerNotInitialized = -32002,
56 UnknownErrorCode = -32001, 56 UnknownErrorCode = -32001,
57 RequestCancelled = -32800, 57 RequestCancelled = -32800,
58 ContentModified = -32801,
58} 59}
59 60
60#[derive(Debug, Serialize, Deserialize, Clone)] 61#[derive(Debug, Serialize, Deserialize, Clone)]
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index d2f16ea97..1d6e3e5d6 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -386,7 +386,7 @@ impl<'a> PoolDispatcher<'a> {
386 if is_canceled(&e) { 386 if is_canceled(&e) {
387 RawResponse::err( 387 RawResponse::err(
388 id, 388 id,
389 ErrorCode::RequestCancelled as i32, 389 ErrorCode::ContentModified as i32,
390 e.to_string(), 390 e.to_string(),
391 ) 391 )
392 } else { 392 } else {