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

build fix: don't use API not available in IDEA 161

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-10-28 21:16:29 +02:00
parent ed2a218ec2
commit 91f76ada04
1 changed files with 2 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
+2 -1
View File
@@ -101,7 +101,8 @@ class KotlinDefinitionsSearcher : QueryExecutor<PsiElement, DefinitionsScopedSea
searchScope: LocalSearchScope, searchScope: LocalSearchScope,
consumer: Processor<PsiElement>): Boolean { consumer: Processor<PsiElement>): 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 globalScope = GlobalSearchScope.filesScope(psiClass.project, searchScope.virtualFiles.toList()) val virtualFiles = searchScope.scope.mapTo(HashSet()) { it.containingFile.virtualFile }
val globalScope = GlobalSearchScope.filesScope(psiClass.project, virtualFiles)
return ContainerUtil.process(ClassInheritorsSearch.search(psiClass, globalScope, true), Processor<PsiClass> { candidate -> return ContainerUtil.process(ClassInheritorsSearch.search(psiClass, globalScope, true), Processor<PsiClass> { candidate ->
val candidateOrigin = candidate.unwrapped ?: candidate val candidateOrigin = candidate.unwrapped ?: candidate
if (candidateOrigin in searchScope) { if (candidateOrigin in searchScope) {