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

Port stub-relating changes from 'master' of IntelliJ

Browse Source
This commit is contained in:
Yan Zhulanow
2022-03-17 17:44:55 +09:00
parent a1b6c9f546
commit dd2afb558e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt
+5 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
class ClsKotlinBinaryClassCache { class ClsKotlinBinaryClassCache {
class KotlinBinaryClassHeaderData( class KotlinBinaryClassHeaderData(
@@ -24,7 +25,10 @@ class ClsKotlinBinaryClassCache {
val metadataVersion: JvmMetadataVersion, val metadataVersion: JvmMetadataVersion,
val partNamesIfMultifileFacade: List<String>, val partNamesIfMultifileFacade: List<String>,
val packageName: String? val packageName: String?
) ) {
val packageNameWithFallback: FqName
get() = packageName?.let(::FqName) ?: classId.packageFqName
}
data class KotlinBinaryData(val isKotlinBinary: Boolean, val timestamp: Long, val headerData: KotlinBinaryClassHeaderData?) data class KotlinBinaryData(val isKotlinBinary: Boolean, val timestamp: Long, val headerData: KotlinBinaryClassHeaderData?)
analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt
+1 -2
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCa
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.types.asFlexibleType import org.jetbrains.kotlin.types.asFlexibleType
import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.kotlin.types.isFlexible
@@ -33,7 +32,7 @@ fun buildDecompiledTextForClassFile(
} }
fun buildText(declarations: List<DeclarationDescriptor>) = buildDecompiledText( fun buildText(declarations: List<DeclarationDescriptor>) = buildDecompiledText(
classHeader.packageName?.let(::FqName) ?: classId.packageFqName, classHeader.packageNameWithFallback,
declarations, decompilerRendererForClassFiles, listOf(ByDescriptorIndexer, BySignatureIndexer) declarations, decompilerRendererForClassFiles, listOf(ByDescriptorIndexer, BySignatureIndexer)
) )