Merge #1398

1398: check for cancellation when executing queries r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 6 insertions, 2 deletions

diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index b3f395502..82b061419 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -33,8 +33,12 @@ impl salsa::Database for RootDatabase {
         Canceled::throw()
     }
     fn salsa_event(&self, event: impl Fn() -> salsa::Event<RootDatabase>) {
-        if let salsa::EventKind::DidValidateMemoizedValue { .. } = event().kind {
-            self.check_canceled();
+        match event().kind {
+            salsa::EventKind::DidValidateMemoizedValue { .. }
+            | salsa::EventKind::WillExecute { .. } => {
+                self.check_canceled();
+            }
+            _ => (),
         }
     }
 }