From 3495ec198d3be44c0944c7656e158a7a3fa488d9 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 9 Oct 2020 13:20:10 +0300
Subject: [PATCH] Minor. Small clean-up in KLIB decompiler

---
 .../jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt | 9 ++-------
 .../idea/klib/KlibMetadataDeserializerForDecompiler.kt   | 6 +-----
 .../konan/decompiler/KotlinNativeMetadataDecompiler.kt   | 5 ++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
index 415ff480ccd..ff2208903dd 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
@@ -80,9 +80,7 @@ abstract class KlibMetadataDecompiler<out V : BinaryVersion>(
     private fun buildDecompiledText(virtualFile: VirtualFile): DecompiledText {
         assert(virtualFile.fileType == fileType) { "Unexpected file type ${virtualFile.fileType}" }
 
-        val file = readFileSafely(virtualFile)
-
-        return when (file) {
+        return when (val file = readFileSafely(virtualFile)) {
             is FileWithMetadata.Incompatible -> createIncompatibleAbiVersionDecompiledText(expectedBinaryVersion(), file.version)
             is FileWithMetadata.Compatible -> decompiledText(
                 file,
@@ -98,10 +96,7 @@ abstract class KlibMetadataDecompiler<out V : BinaryVersion>(
 sealed class FileWithMetadata {
     class Incompatible(val version: BinaryVersion) : FileWithMetadata()
 
-    open class Compatible(
-        val proto: ProtoBuf.PackageFragment,
-        serializerProtocol: SerializerExtensionProtocol // TODO: Is it required?
-    ) : FileWithMetadata() {
+    open class Compatible(val proto: ProtoBuf.PackageFragment) : FileWithMetadata() {
         val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
         val packageFqName = FqName(proto.getExtension(KlibMetadataProtoBuf.fqName))
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
index 01704ccc2b1..ed89e8ed95f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
@@ -42,9 +42,7 @@ class KlibMetadataDeserializerForDecompiler(
             storageManager, moduleDescriptor, DeserializationConfiguration.Default,
             KlibMetadataClassDataFinder(proto, nameResolver),
             AnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, serializerProtocol), packageFragmentProvider,
-            ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), createLoggingErrorReporter(
-                LOG
-            ),
+            ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), LoggingErrorReporter(LOG),
             LookupTracker.DO_NOTHING, flexibleTypeDeserializer, emptyList(), notFoundClasses, ContractDeserializer.DEFAULT,
             extensionRegistryLite = serializerProtocol.extensionRegistry,
             samConversionResolver = SamConversionResolverImpl(storageManager, samWithReceiverResolvers = emptyList())
@@ -72,5 +70,3 @@ class KlibMetadataDeserializerForDecompiler(
         private val LOG = Logger.getInstance(KlibMetadataDeserializerForDecompiler::class.java)
     }
 }
-
-fun createLoggingErrorReporter(log: Logger) = LoggingErrorReporter(log)
\ No newline at end of file
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
index a64a32f220f..48a0e6f7e8b 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
@@ -23,8 +23,7 @@ class KotlinNativeMetadataDecompiler : KlibMetadataDecompiler<KlibMetadataVersio
     KlibMetaFileType.STUB_VERSION
 ) {
     override fun doReadFile(file: VirtualFile): FileWithMetadata? {
-        val fragment = KlibLoadingMetadataCache
-            .getInstance().getCachedPackageFragment(file) ?: return null
-        return FileWithMetadata.Compatible(fragment, KlibMetadataSerializerProtocol) //todo: check version compatibility
+        val fragment = KlibLoadingMetadataCache.getInstance().getCachedPackageFragment(file) ?: return null
+        return FileWithMetadata.Compatible(fragment) //todo: check version compatibility
     }
 }