Merge pull request #86 from KotlinIsland/something

Cancel future when process is canceled
leinardi · Feb 19, 2022 · 3da05cb · 3da05cb
2 parents a963665 + 175dc63
commit 3da05cb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/leinardi/pycharm/mypy/util/Async.java b/src/main/java/com/leinardi/pycharm/mypy/util/Async.java
@@ -17,6 +17,7 @@
 package com.leinardi.pycharm.mypy.util;
 
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -47,7 +48,12 @@ public static <T> Future<T> executeOnPooledThread(final Callable<T> callable) {
 
     public static <T> Future<T> whenFinished(final Future<T> future) {
         while (!future.isDone() && !future.isCancelled()) {
-            ProgressManager.checkCanceled();
+            try {
+                ProgressManager.checkCanceled();
+            } catch (ProcessCanceledException e) {
+                future.cancel(true);
+                throw e;
+            }
             waitFor(FIFTY_MS);
         }
         return future;