LS: Unrecognized LS requests to be cancelled on salsa failures (#6319)

starkware-libs · Sep 2, 2024 · e2ff77c · e2ff77c
1 parent aadb183
commit e2ff77c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/crates/cairo-lang-language-server/src/lib.rs b/crates/cairo-lang-language-server/src/lib.rs
@@ -320,7 +320,16 @@ impl Backend {
     {
         spawn_blocking(move || {
             catch_unwind(AssertUnwindSafe(f)).map_err(|err| {
-                if err.is::<Cancelled>() {
+                // Salsa is broken and sometimes when cancelled throws regular assert instead of
+                // [`Cancelled`]. Catch this case too.
+                if err.is::<Cancelled>()
+                    || err.downcast_ref::<&str>().is_some_and(|msg| {
+                        msg.contains(
+                            "assertion failed: old_memo.revisions.changed_at <= \
+                             revisions.changed_at",
+                        )
+                    })
+                {
                     debug!("LSP worker thread was cancelled");
                     LSPError::request_cancelled()
                 } else {