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

use top level classId for looking up java classes in KotlinCliJavaFileManagerImpl

Browse Source
This commit is contained in:
Jiaxiang Chen
2022-08-10 16:42:39 -07:00
committed by Denis.Zharkov
parent 3eb0868d5b
commit 94abeb64c5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
+5 -3
View File
@@ -72,7 +72,8 @@ class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) : CoreJ
private fun findVirtualFileForTopLevelClass(classId: ClassId, searchScope: GlobalSearchScope): VirtualFile? { private fun findVirtualFileForTopLevelClass(classId: ClassId, searchScope: GlobalSearchScope): VirtualFile? {
val relativeClassName = classId.relativeClassName.asString() 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 // 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. // class files for the previous build on the class path.
// //
@@ -86,8 +87,9 @@ class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) : CoreJ
// we want to make sure that we get the new A.java and not the old version A.class from previous.jar. // 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. // Otherwise B.kt will not see the newly added field in A.
singleJavaFileRootsIndex.findJavaSourceClass(classId) val outerMostClassId = ClassId.topLevel(outerMostClassFqName)
?: index.findClass(classId) { dir, type -> singleJavaFileRootsIndex.findJavaSourceClass(outerMostClassId)
?: index.findClass(outerMostClassId) { dir, type ->
findVirtualFileGivenPackage(dir, relativeClassName, type) findVirtualFileGivenPackage(dir, relativeClassName, type)
} }