commit 56ac2d3027bda9479d77dbb1bdb779130f0638b3
author Jiaxiang Chen <jiaxiang@google.com> Wed Aug 10 16:42:39 2022 -0700
committer Jiaxiang Chen <jiaxiang@google.com> Thu Aug 11 13:12:50 2022 -0700
tree 858e38d06be3742a14629231c6fe6277b87edf7e
parent 434872c5a96d205c2a678d4040f4454e4d516c79

use top level classId for looking up java classes in KotlinCliJavaFileManagerImpl

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
index 3eafef9..914c096 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
@@ -72,7 +72,8 @@
 
     private fun findVirtualFileForTopLevelClass(classId: ClassId, searchScope: GlobalSearchScope): VirtualFile? {
         val relativeClassName = classId.relativeClassName.asString()
-        return topLevelClassesCache.getOrPut(classId.packageFqName.child(classId.relativeClassName.pathSegments().first())) {
+        val outerMostClassFqName = classId.packageFqName.child(classId.relativeClassName.pathSegments().first())
+        return topLevelClassesCache.getOrPut(outerMostClassFqName) {
             // Search java sources first. For build tools, it makes sense to build new files passing all the
             // class files for the previous build on the class path.
             //
@@ -86,8 +87,9 @@
             // we want to make sure that we get the new A.java and not the old version A.class from previous.jar.
             //
             // Otherwise B.kt will not see the newly added field in A.
-            singleJavaFileRootsIndex.findJavaSourceClass(classId)
-                ?: index.findClass(classId) { dir, type ->
+            val outerMostClassId = ClassId.topLevel(outerMostClassFqName)
+            singleJavaFileRootsIndex.findJavaSourceClass(outerMostClassId)
+                ?: index.findClass(outerMostClassId) { dir, type ->
                     findVirtualFileGivenPackage(dir, relativeClassName, type)
                 }