From 072d1a1e8a9faf648767909677cdbcc5a3685adc Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 5 Oct 2017 10:16:36 +0200
Subject: [PATCH] canceled searching for tests

---
 .../impl/src/com/intellij/execution/TestClassCollector.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/execution/impl/src/com/intellij/execution/TestClassCollector.java b/java/execution/impl/src/com/intellij/execution/TestClassCollector.java
index 4587ec1c7008..972de9cedf05 100644
--- a/java/execution/impl/src/com/intellij/execution/TestClassCollector.java
+++ b/java/execution/impl/src/com/intellij/execution/TestClassCollector.java
@@ -19,6 +19,8 @@ import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.roots.CompilerModuleExtension;
 import com.intellij.openapi.roots.OrderEnumerator;
 import com.intellij.openapi.util.io.FileUtil;
@@ -72,6 +74,7 @@ public class TestClassCollector {
         Files.walkFileTree(baseDir, new SimpleFileVisitor<Path>() {
           @Override
           public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            ProgressManager.checkCanceled();
             FileVisitResult result = super.visitFile(file, attrs);
             File f = file.toFile();
             String fName = f.getName();
@@ -102,6 +105,9 @@ public class TestClassCollector {
         });
       }
     }
+    catch (ProcessCanceledException e) {
+      throw e;
+    }
     catch (Throwable e) {
       LOG.error(e);
     }