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

read action

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-27 13:12:39 +02:00
parent 4b7bfa8691
commit 3dc2887a84
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+8 -14
View File
@@ -44,7 +44,6 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Set;
public class JavaFunctionalExpressionSearcher implements QueryExecutor<PsiFunctionalExpression, FunctionalExpressionSearch.SearchParameters> {
@@ -92,7 +91,12 @@ public class JavaFunctionalExpressionSearcher implements QueryExecutor<PsiFuncti
final Processor<PsiFunctionalExpression> consumer,
final Set<Module> highLevelModules) {
final Project project = PsiUtilCore.getProjectInReadAction(aClass);
final GlobalSearchScope scope = prepareScopeToProcessFiles(highLevelModules, aClass, searchScope, project);
final GlobalSearchScope scope = ApplicationManager.getApplication().runReadAction(new Computable<GlobalSearchScope>() {
@Override
public GlobalSearchScope compute() {
return prepareScopeToProcessFiles(highLevelModules, aClass, searchScope, project);
}
});
final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
final HashSet<VirtualFile> files = new HashSet<VirtualFile>();
CommonProcessors.CollectProcessor<VirtualFile> processor = new CommonProcessors.CollectProcessor<VirtualFile>(files) {
@@ -124,18 +128,8 @@ public class JavaFunctionalExpressionSearcher implements QueryExecutor<PsiFuncti
final PsiClass aClass,
final SearchScope searchScope,
final Project project) {
final SearchScope classScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
@Override
public SearchScope compute() {
return aClass.getUseScope();
}
});
final SearchScope useScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
@Override
public SearchScope compute() {
return searchScope.intersectWith(classScope);
}
});
final SearchScope useScope = searchScope.intersectWith(aClass.getUseScope());
final GlobalSearchScope scope;
if (useScope instanceof GlobalSearchScope) {
scope = (GlobalSearchScope)useScope;