From f73c7f68db293ddbf8e45400e661425c6814fb52 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 10 Jul 2012 15:08:54 +0200 Subject: [PATCH] EA-37259 add read action --- .../refactoring/util/TextOccurrencesUtil.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/util/TextOccurrencesUtil.java b/platform/lang-impl/src/com/intellij/refactoring/util/TextOccurrencesUtil.java index ab7c5ef996e4..22281f3f8025 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/util/TextOccurrencesUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/util/TextOccurrencesUtil.java @@ -24,6 +24,8 @@ import com.intellij.find.impl.FindManagerImpl; import com.intellij.lang.ASTNode; import com.intellij.lang.LanguageParserDefinitions; import com.intellij.lang.ParserDefinition; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -54,12 +56,17 @@ public class TextOccurrencesUtil { }, factory); } - public static void processTextOccurences(@NotNull PsiElement element, + public static void processTextOccurences(@NotNull final PsiElement element, @NotNull String stringToSearch, @NotNull GlobalSearchScope searchScope, @NotNull final Processor processor, @NotNull final UsageInfoFactory factory) { - PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(element.getProject()); + PsiSearchHelper helper = ApplicationManager.getApplication().runReadAction(new Computable() { + @Override + public PsiSearchHelper compute() { + return PsiSearchHelper.SERVICE.getInstance(element.getProject()); + } + }); helper.processUsagesInNonJavaFiles(element, stringToSearch, new PsiNonJavaFileReferenceProcessor() { public boolean process(PsiFile psiFile, int startOffset, int endOffset) {