azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EA-209582: Add a missing runReadAction()

Browse Source
This commit is contained in:
Yan Zhulanow
2020-03-05 23:23:30 +09:00
parent 075870fee9
commit 0bd2643788
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt
+4 -1
View File
@@ -123,7 +123,10 @@ class KotlinDefinitionsSearcher : QueryExecutor<PsiElement, DefinitionsScopedSea
consumer: Processor<PsiElement> consumer: Processor<PsiElement>
): Boolean { ): Boolean {
// workaround for IDEA optimization that uses Java PSI traversal to locate inheritors in local search scope // workaround for IDEA optimization that uses Java PSI traversal to locate inheritors in local search scope
val virtualFiles = searchScope.scope.mapTo(HashSet()) { it.containingFile.virtualFile } val virtualFiles = runReadAction {
searchScope.scope.mapTo(HashSet()) { it.containingFile.virtualFile }
}
val globalScope = GlobalSearchScope.filesScope(psiClass.project, virtualFiles) val globalScope = GlobalSearchScope.filesScope(psiClass.project, virtualFiles)
return ContainerUtil.process(ClassInheritorsSearch.search(psiClass, globalScope, true)) { candidate -> return ContainerUtil.process(ClassInheritorsSearch.search(psiClass, globalScope, true)) { candidate ->
val candidateOrigin = candidate.unwrapped ?: candidate val candidateOrigin = candidate.unwrapped ?: candidate