From 47759bf88d9f9712e80533eb0541bb0e284ff98c Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 25 Jan 2017 10:52:53 +0300 Subject: [PATCH] search for method duplicates in class hierarchy scope: ensure scope is build in EDT --- .../refactoring/util/duplicates/MethodDuplicatesHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java index bf9fd6d0ff84..1699b981ef40 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java @@ -86,11 +86,12 @@ public class MethodDuplicatesHandler implements RefactoringActionHandler, Contex project, scope, module != null ? module.getName() : null, false, AnalysisUIOptions.getInstance(project), element); if (dlg.showAndGet()) { + AnalysisScope selectedScope = dlg.getScope(AnalysisUIOptions.getInstance(project), scope, project, module); ProgressManager.getInstance().run(new Task.Backgroundable(project, "Locate duplicates", true) { @Override public void run(@NotNull ProgressIndicator indicator) { indicator.setIndeterminate(true); - invokeOnScope(project, member, dlg.getScope(AnalysisUIOptions.getInstance(project), scope, project, module)); + invokeOnScope(project, member, selectedScope); } }); }