From 0f362c01f9e600120f1cfd07e27f8d3c737e9c7f Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Wed, 1 Jun 2016 19:40:04 +0300
Subject: [PATCH] ExtractMethodHelper#collectDuplicates runs under modal
 progress indicator

---
 .../extractMethod/ExtractMethodHelper.java    | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHelper.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHelper.java
index 61c2976a6cbf..208b9e80baee 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHelper.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHelper.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.editor.markup.TextAttributes;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -35,16 +36,14 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.ui.ReplacePromptDialog;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Dennis.Ushakov
@@ -80,11 +79,13 @@ public class ExtractMethodHelper {
 
   /**
    * Finds duplicates of the code fragment specified in the finder in given scopes.
+   * Note that in contrast to {@link #processDuplicates} the search is performed synchronously because normally you need the results in 
+   * order to complete the refactoring. If user cancels it, empty list will be returned.
    *
    * @param finder          finder object to seek for duplicates
    * @param searchScopes    scopes where to look them in
    * @param generatedMethod new method that should be excluded from the search
-   * @return list of duplicate code fragments discovered
+   * @return list of discovered duplicate code fragments or empty list if user interrupted the search 
    * @see #replaceDuplicatesWithPrompt(List, PsiElement, Editor, Consumer) 
    */
   @NotNull
@@ -94,8 +95,18 @@ public class ExtractMethodHelper {
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       return finder.findDuplicates(searchScopes, generatedMethod);
     }
-    return ReadAction.compute(() -> finder.findDuplicates(searchScopes, generatedMethod));
+    final Project project = generatedMethod.getProject();
+    try {
+      return ProgressManager.getInstance().runProcessWithProgressSynchronously(
+        (ThrowableComputable<List<SimpleMatch>, RuntimeException>)() -> {
+          return ReadAction.compute(() -> finder.findDuplicates(searchScopes, generatedMethod));
+        }, "Searching for duplicates...", true, project);
+    }
+    catch (ProcessCanceledException e) {
+      return Collections.emptyList();
+    }
   }
+  
 
   /**
    * Notifies user about found duplicates and then highlights each of them in the editor and asks user how to proceed.