MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

add read action (EA-37259)

Browse Source
This commit is contained in:
peter
2012-08-07 19:07:43 +02:00
parent 0c9a32e11f
commit 367771be6b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+11 -6
View File
@@ -342,7 +342,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
public void processUsagesInNonJavaFiles(@Nullable final PsiElement originalElement,
@NotNull String qName,
@NotNull final PsiNonJavaFileReferenceProcessor processor,
@NotNull GlobalSearchScope searchScope) {
@NotNull final GlobalSearchScope initialScope) {
if (qName.length() == 0) {
throw new IllegalArgumentException("Cannot search for elements with empty text");
}
@@ -352,10 +352,15 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
int dollarIndex = qName.lastIndexOf('$');
int maxIndex = Math.max(dotIndex, dollarIndex);
final String wordToSearch = maxIndex >= 0 ? qName.substring(maxIndex + 1) : qName;
if (originalElement != null && myManager.isInProject(originalElement) && searchScope.isSearchInLibraries()) {
searchScope = searchScope.intersectWith(GlobalSearchScope.projectScope(myManager.getProject()));
}
final GlobalSearchScope theSearchScope = searchScope;
final GlobalSearchScope theSearchScope = ApplicationManager.getApplication().runReadAction(new Computable<GlobalSearchScope>() {
@Override
public GlobalSearchScope compute() {
if (originalElement != null && myManager.isInProject(originalElement) && initialScope.isSearchInLibraries()) {
return initialScope.intersectWith(GlobalSearchScope.projectScope(myManager.getProject()));
}
return initialScope;
}
});
PsiFile[] files = ApplicationManager.getApplication().runReadAction(new Computable<PsiFile[]>() {
@Override
public PsiFile[] compute() {
@@ -380,7 +385,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
}.execute().getResultObject();
final Ref<Boolean> cancelled = new Ref<Boolean>(Boolean.FALSE);
final GlobalSearchScope finalScope = searchScope;
final GlobalSearchScope finalScope = initialScope;
for (int i = 0; i < files.length; i++) {
if (progress != null) progress.checkCanceled();