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

Refactor KotlinCliJavaFileManager: make it return JavaClass

Browse Source 
It seems to be very natural refactoring considering the
following changes: optimizing KotlinCliJavaFileManagerImpl.findClass
to make it read class files manually instead of requesting PSI
This commit is contained in:
Denis Zharkov
2017-04-20 16:28:58 +03:00
parent 506d7ab3d2
commit 88950521a8
5 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt
+2 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
import org.jetbrains.kotlin.cli.jvm.index.JavaRoot
import org.jetbrains.kotlin.cli.jvm.index.JvmDependenciesIndexImpl
import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
@@ -210,7 +211,7 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() {
val classId = ClassId(FqName(packageFQName), FqName(classFqName), false)
val stringRequest = classId.asSingleFqName().asString()
val foundByClassId = manager.findClass(classId, allScope)
val foundByClassId = (manager.findClass(classId, allScope) as JavaClassImpl).psi
val foundByString = manager.findClass(stringRequest, allScope)
TestCase.assertNotNull("Could not find: $classId", foundByClassId)