[klib] Don't pass around metadata serialization closure

Pass the metadata serializer instance instead. This allows to further
reduce code duplication by introducing the common interface
`KlibSingleFileMetadataSerializer` for abstracting away K1 and K2
representation of a source file, as well as reusing
`Fir2KlibMetadataSerializer` across different backends.

KT-64392

compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt

@@ -5,10 +5,7 @@
 
 package org.jetbrains.kotlin.klib
 
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiElement
 import junit.framework.TestCase
-import org.jetbrains.kotlin.KtPsiSourceFile
 import org.jetbrains.kotlin.backend.common.CommonKLibResolver
 import org.jetbrains.kotlin.backend.common.linkage.issues.checkNoUnboundSymbols
 import org.jetbrains.kotlin.backend.common.linkage.partial.PartialLinkageSupportForLinker
@@ -18,11 +15,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.codegen.CodegenTestCase
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
-import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.languageVersionSettings
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.incremental.components.LookupTracker
@@ -34,7 +28,6 @@ import org.jetbrains.kotlin.ir.backend.js.KlibMetadataIncrementalSerializer
 import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsIrLinker
 import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc
 import org.jetbrains.kotlin.ir.backend.js.serializeModuleIntoKlib
-import org.jetbrains.kotlin.ir.backend.js.serializeScope
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.ir.util.*
@@ -45,17 +38,13 @@ import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.library.impl.BuiltInsPlatform
-import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion
 import org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
 import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
 import org.jetbrains.kotlin.psi2ir.descriptors.IrBuiltInsOverDescriptors
 import org.jetbrains.kotlin.psi2ir.generators.TypeTranslatorImpl
 import org.jetbrains.kotlin.resolve.AnalyzingUtils
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.BindingContextUtils
 import org.jetbrains.kotlin.resolve.CompilerEnvironment
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.test.ConfigurationKind
@@ -119,42 +108,25 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
         }
     }
 
-    private fun klibMetadataIncrementalSerializer(configuration: CompilerConfiguration, project: Project, allowErrors: Boolean) =
-        KlibMetadataIncrementalSerializer(
-            languageVersionSettings = configuration.languageVersionSettings,
-            metadataVersion = KlibMetadataVersion.INSTANCE,
-            project = project,
-            exportKDoc = false,
-            allowErrorTypes = allowErrors
-        )
-
-    private fun getDescriptorForElement(
-        context: BindingContext,
-        element: PsiElement
-    ): DeclarationDescriptor = BindingContextUtils.getNotNull(context, BindingContext.DECLARATION_TO_DESCRIPTOR, element)
-
-    private fun KlibMetadataIncrementalSerializer.serializeScope(
-        ktFile: KtFile,
-        bindingContext: BindingContext,
-        moduleDescriptor: ModuleDescriptor
-    ): ProtoBuf.PackageFragment {
-        val memberScope = ktFile.declarations.map { getDescriptorForElement(bindingContext, it) }
-        return serializePackageFragment(moduleDescriptor, memberScope, ktFile.packageFqName)
-    }
-
     private fun serializeModule(
         irModuleFragment: IrModuleFragment,
         bindingContext: BindingContext,
         stdlib: KotlinLibrary,
         containsErrorCode: Boolean,
     ): String {
-        val metadataSerializer = klibMetadataIncrementalSerializer(myEnvironment.configuration, myEnvironment.project, containsErrorCode)
         val klibDir = org.jetbrains.kotlin.konan.file.createTempDir("testKlib")
         serializeModuleIntoKlib(
             moduleName = MODULE_NAME,
             configuration = myEnvironment.configuration,
             diagnosticReporter = DiagnosticReporterFactory.createPendingReporter(),
-            files = myFiles.psiFiles.map(::KtPsiSourceFile),
+            metadataSerializer = KlibMetadataIncrementalSerializer(
+                files = myFiles.psiFiles,
+                configuration = myEnvironment.configuration,
+                project = myEnvironment.project,
+                bindingContext = bindingContext,
+                moduleDescriptor = irModuleFragment.descriptor,
+                allowErrorTypes = containsErrorCode
+            ),
             klibPath = klibDir.canonicalPath,
             dependencies = listOf(stdlib),
             moduleFragment = irModuleFragment,
@@ -165,7 +137,6 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
             abiVersion = KotlinAbiVersion.CURRENT,
             jsOutputName = null,
             builtInsPlatform = BuiltInsPlatform.JS,
-            serializeSingleFile = { metadataSerializer.serializeScope(it, bindingContext, irModuleFragment.descriptor) }
         )
         return klibDir.canonicalPath
     }