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

[lc] support decompiled facade only for .class

Browse Source 
we have support only for KtClsFile (see decompiled light classes) so kotlin_builtins and kotlin_metadata should be ignored

^KT-53543
This commit is contained in:
Dmitry Gridin
2022-08-22 13:04:20 +02:00
committed by Space
parent 031edb7344
commit feb31b79de
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/DecompiledLightClassesFactory.kt
+1 -1
View File
@@ -113,7 +113,7 @@ object DecompiledLightClassesFactory {
): KtLightClassForFacade? { ): KtLightClassForFacade? {
assert(files.all(KtFile::isCompiled)) assert(files.all(KtFile::isCompiled))
val file = files.firstOrNull { it.javaFileFacadeFqName == facadeClassFqName } as? KtClsFile val file = files.firstOrNull { it.javaFileFacadeFqName == facadeClassFqName } as? KtClsFile
?: error("Can't find the representative decompiled file for $facadeClassFqName") ?: error("Can't find the representative decompiled file for $facadeClassFqName in ${files.map { it.name }}")
return createLightClassForDecompiledKotlinFile(project, file) { kotlinClsFile, javaClsClass, classOrObject -> return createLightClassForDecompiledKotlinFile(project, file) { kotlinClsFile, javaClsClass, classOrObject ->
KtLightClassForDecompiledFacade(javaClsClass, javaClsClass.parent, kotlinClsFile, classOrObject, files) KtLightClassForDecompiledFacade(javaClsClass, javaClsClass.parent, kotlinClsFile, classOrObject, files)
analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupportBase.kt
+1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.psi.KtFile
abstract class KotlinAsJavaSupportBase<TModule>(protected val project: Project) : KotlinAsJavaSupport() { abstract class KotlinAsJavaSupportBase<TModule>(protected val project: Project) : KotlinAsJavaSupport() {
fun createLightFacade(file: KtFile): KtLightClassForFacade? { fun createLightFacade(file: KtFile): KtLightClassForFacade? {
if (file.isScript()) return null if (file.isScript()) return null
if (file.isCompiled && !file.name.endsWith(".class")) return null
val module = file.findModule().takeIf { facadeIsApplicable(it, file) } ?: return null val module = file.findModule().takeIf { facadeIsApplicable(it, file) } ?: return null
val facadeFqName = file.javaFileFacadeFqName val facadeFqName = file.javaFileFacadeFqName