MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

merged sequential read actions

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-05-27 15:48:07 +03:00
parent 39e1334b2c
commit 6e91d83881
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+11 -3
View File
@@ -17,7 +17,6 @@ package com.intellij.psi.impl.search;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.QueryExecutorBase;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.ProgressManager;
@@ -261,9 +260,18 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
currentlyProcessingClasses.down(); // tell other threads we are going to process something
boolean added;
try {
PsiClass candidate = ReadAction.compute(() -> (PsiClass)next.retrieve());
PsiClass candidate = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
@Override
public PsiClass compute() {
PsiClass nextClass = (PsiClass)next.retrieve();
if (nextClass instanceof PsiAnonymousClass || nextClass != null && nextClass.hasModifierProperty(PsiModifier.FINAL)) {
return null;
}
return nextClass;
}
});
if (candidate == null || candidate instanceof PsiAnonymousClass || isFinal(candidate)) {
if (candidate == null) {
added = false;
}
else {