From 3885fa414de9acfc289a76e9b6c0d3aec073c33f Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 29 Jul 2013 19:19:51 +0200 Subject: [PATCH] read action when getting all names (EA-48241) --- .../util/gotoByName/ContributorsBasedGotoByModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java index 212d06088598..2ac6e3230b60 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java @@ -21,6 +21,7 @@ import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.util.NavigationItemListCellRenderer; import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.NavigationItem; +import com.intellij.openapi.application.ReadActionProcessor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.progress.ProcessCanceledException; @@ -38,7 +39,9 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -79,9 +82,9 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel long start = System.currentTimeMillis(); List liveContribs = filterDumb(myContributors); ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator(); - Processor processor = new Processor() { + Processor processor = new ReadActionProcessor() { @Override - public boolean process(ChooseByNameContributor contributor) { + public boolean processInReadAction(ChooseByNameContributor contributor) { try { if (!myProject.isDisposed()) { String[] names = contributor.getNames(myProject, checkBoxState);