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

Leave KotlinCliJavaFileManager::findClass only passing JavaClassFinder.Request

Browse Source
This commit is contained in:
Victor Petukhov
2021-04-25 16:11:10 +03:00
parent 072bba109f
commit 2e57ff25ee
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+4 -2
View File
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.resolve.jvm.modules
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiJavaModule
import com.intellij.psi.PsiModifier
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.load.java.JavaClassFinder
import org.jetbrains.kotlin.load.java.structure.JavaAnnotation
import org.jetbrains.kotlin.load.java.structure.impl.JavaAnnotationImpl
import org.jetbrains.kotlin.load.java.structure.impl.classFiles.BinaryClassSignatureParser
@@ -60,7 +62,7 @@ class JavaModuleInfo(
psiJavaModule.annotations.convert(::JavaAnnotationImpl)
)
fun read(file: VirtualFile, javaFileManager: KotlinCliJavaFileManager): JavaModuleInfo? {
fun read(file: VirtualFile, javaFileManager: KotlinCliJavaFileManager, searchScope: GlobalSearchScope): JavaModuleInfo? {
val contents = try {
file.contentsToByteArray()
} catch (e: IOException) {
@@ -93,7 +95,7 @@ class JavaModuleInfo(
val (annotation, visitor) = BinaryJavaAnnotation.createAnnotationAndVisitor(
descriptor,
ClassifierResolutionContext(javaFileManager::findClass),
ClassifierResolutionContext { javaFileManager.findClass(JavaClassFinder.Request(it), searchScope) },
BinaryClassSignatureParser(),
isFreshlySupportedTypeUseAnnotation = true
)