1 files changed, 15 insertions, 5 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index 1eb147539..229d1b0f7 100644
--- a/crates/ra_lsp_server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -376,11 +376,21 @@ impl<'a> PoolDispatcher<'a> {
                             Ok(lsp_error) => {
                                 RawResponse::err(id, lsp_error.code, lsp_error.message)
                             }
-                            Err(e) => RawResponse::err(
-                                id,
-                                ErrorCode::InternalError as i32,
-                                format!("{}\n{}", e, e.backtrace()),
-                            ),
+                            Err(e) => {
+                                if is_canceled(&e) {
+                                    RawResponse::err(
+                                        id,
+                                        ErrorCode::RequestCancelled as i32,
+                                        e.to_string(),
+                                    )
+                                } else {
+                                    RawResponse::err(
+                                        id,
+                                        ErrorCode::InternalError as i32,
+                                        format!("{}\n{}", e, e.backtrace()),
+                                    )
+                                }
+                            }
                         },
                     };
                     let task = Task::Respond(resp);