1 files changed, 6 insertions, 1 deletions

diff --git a/crates/ra_lsp_server/src/world.rs b/crates/ra_lsp_server/src/world.rs
index 9fd654305..1d7755910 100644
--- a/crates/ra_lsp_server/src/world.rs
+++ b/crates/ra_lsp_server/src/world.rs
@@ -215,7 +215,12 @@ impl WorldSnapshot {
             }
         }
         res.push_str("\nanalysis:\n");
-        res.push_str(&self.analysis.status());
+        res.push_str(
+            &self
+                .analysis
+                .status()
+                .unwrap_or_else(|_| "Analysis retrieval was cancelled".to_owned()),
+        );
         res
     }