aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-12-30 21:18:16 +0000
committerAleksey Kladov <[email protected]>2019-12-30 21:20:04 +0000
commit23bac120625ca96402426e241c91ed5f3d7ccc02 (patch)
tree271429fe8639f603a91dd20cfdd950a3f5887e12 /crates/ra_lsp_server
parent08c5d157f9a24f0094c90c556019a20bf85e5a07 (diff)
Retry inlay hints on content modified error
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs15
1 files changed, 5 insertions, 10 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index af1a487de..4336583fe 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -709,16 +709,11 @@ where
709 Ok(lsp_error) => Response::new_err(id, lsp_error.code, lsp_error.message), 709 Ok(lsp_error) => Response::new_err(id, lsp_error.code, lsp_error.message),
710 Err(e) => { 710 Err(e) => {
711 if is_canceled(&e) { 711 if is_canceled(&e) {
712 // FIXME: When https://github.com/Microsoft/vscode-languageserver-node/issues/457 712 Response::new_err(
713 // gets fixed, we can return the proper response. 713 id,
714 // This works around the issue where "content modified" error would continuously 714 ErrorCode::ContentModified as i32,
715 // show an message pop-up in VsCode 715 "content modified".to_string(),
716 // Response::err( 716 )
717 // id,
718 // ErrorCode::ContentModified as i32,
719 // "content modified".to_string(),
720 // )
721 Response::new_ok(id, ())
722 } else { 717 } else {
723 Response::new_err(id, ErrorCode::InternalError as i32, e.to_string()) 718 Response::new_err(id, ErrorCode::InternalError as i32, e.to_string())
724 } 719 }