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

Avoid unnecessary collection copy (KT-23384)

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-03-27 17:50:07 +02:00
parent 6f1881b9ff
commit 85ebe97597
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
+5 -3
View File
@@ -173,7 +173,9 @@ class IDEKotlinAsJavaSupport(private val project: Project): KotlinAsJavaSupport(
override fun getKotlinInternalClasses(fqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> { override fun getKotlinInternalClasses(fqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
if (fqName.isRoot) return emptyList() if (fqName.isRoot) return emptyList()
return findPackageParts(fqName, scope) + findPlatformWrapper(fqName, scope) val packageParts = findPackageParts(fqName, scope)
val platformWrapper = findPlatformWrapper(fqName, scope)
return if (platformWrapper != null) packageParts + platformWrapper else packageParts
} }
private fun findPackageParts(fqName: FqName, scope: GlobalSearchScope): List<KtLightClassForDecompiledDeclaration> { private fun findPackageParts(fqName: FqName, scope: GlobalSearchScope): List<KtLightClassForDecompiledDeclaration> {
@@ -193,12 +195,12 @@ class IDEKotlinAsJavaSupport(private val project: Project): KotlinAsJavaSupport(
} }
} }
private fun findPlatformWrapper(fqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> { private fun findPlatformWrapper(fqName: FqName, scope: GlobalSearchScope): PsiClass? {
return platformMutabilityWrapper(fqName) { return platformMutabilityWrapper(fqName) {
JavaPsiFacade.getInstance( JavaPsiFacade.getInstance(
project project
).findClass(it, scope) ).findClass(it, scope)
}?.let { listOf(it) }.orEmpty() }
} }
fun createLightClassForFileFacade( fun createLightClassForFileFacade(