Port stub-relating changes from 'master' of IntelliJ

analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt

@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
 import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
 
 class ClsKotlinBinaryClassCache {
     class KotlinBinaryClassHeaderData(
@@ -24,7 +25,10 @@ class ClsKotlinBinaryClassCache {
         val metadataVersion: JvmMetadataVersion,
         val partNamesIfMultifileFacade: List<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?)
 

analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCa
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.types.asFlexibleType
 import org.jetbrains.kotlin.types.isFlexible
@@ -33,7 +32,7 @@ fun buildDecompiledTextForClassFile(
     }
 
     fun buildText(declarations: List<DeclarationDescriptor>) = buildDecompiledText(
-        classHeader.packageName?.let(::FqName) ?: classId.packageFqName,
+        classHeader.packageNameWithFallback,
         declarations, decompilerRendererForClassFiles, listOf(ByDescriptorIndexer, BySignatureIndexer)
     )