JS IR: moved klib creation to the serialization_test module

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt

@@ -35,7 +35,10 @@ import org.jetbrains.kotlin.js.analyzer.JsAnalysisResult
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
 import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
+import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
+import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -53,10 +56,8 @@ data class KlibModuleRef(
 internal val JS_KLIBRARY_CAPABILITY = ModuleDescriptor.Capability<File>("JS KLIBRARY")
 internal val moduleHeaderFileName = "module.kji"
 internal val declarationsDirName = "ir/"
-private val logggg = object : LoggingContext {
-    override var inVerbosePhase: Boolean
-        get() = TODO("not implemented")
-        set(_) {}
+private val emptyLoggingContext = object : LoggingContext {
+    override var inVerbosePhase = false
 
     override fun log(message: () -> String) {}
 }
@@ -76,12 +77,9 @@ fun generateKLib(
 ): KlibModuleRef {
     val depsDescriptors = ModulesStructure(project, files, configuration, immediateDependencies, allDependencies)
 
-    val analysisResult = depsDescriptors.runAnalysis()
+    val psi2IrContext = runAnalysisAndPreparePsi2Ir(depsDescriptors)
 
-    val psi2IrTranslator = Psi2IrTranslator(configuration.languageVersionSettings)
-    val psi2IrContext = psi2IrTranslator.createGeneratorContext(analysisResult.moduleDescriptor, analysisResult.bindingContext)
-
-    val moduleFragment = psi2IrTranslator.generateModuleFragment(psi2IrContext, files)
+    val moduleFragment = psi2IrContext.generateModuleFragment(files)
 
     val moduleName = configuration[CommonConfigurationKeys.MODULE_NAME]!!
     serializeModuleIntoKlib(
@@ -114,28 +112,40 @@ fun loadIr(
 ): IrModuleInfo {
     val depsDescriptors = ModulesStructure(project, files, configuration, immediateDependencies, allDependencies)
 
-    val analysisResult = depsDescriptors.runAnalysis()
+    val psi2IrContext = runAnalysisAndPreparePsi2Ir(depsDescriptors)
 
-    val moduleDescriptor = analysisResult.moduleDescriptor
-
-    val symbolTable = SymbolTable()
-
-    val psi2IrTranslator = Psi2IrTranslator(configuration.languageVersionSettings)
-    val psi2IrContext = psi2IrTranslator.createGeneratorContext(moduleDescriptor, analysisResult.bindingContext, symbolTable)
     val irBuiltIns = psi2IrContext.irBuiltIns
+    val symbolTable = psi2IrContext.symbolTable
+    val moduleDescriptor = psi2IrContext.moduleDescriptor
 
-    val deserializer = JsIrLinker(moduleDescriptor, logggg, irBuiltIns, symbolTable)
+    val deserializer = JsIrLinker(moduleDescriptor, emptyLoggingContext, irBuiltIns, symbolTable)
 
     val deserializedModuleFragments = depsDescriptors.sortedImmediateDependencies.map {
-        val moduleFile = File(it.klibPath, moduleHeaderFileName)
         deserializer.deserializeIrModuleHeader(depsDescriptors.getModuleDescriptor(it))!!
     }
 
-    val moduleFragment = psi2IrTranslator.generateModuleFragment(psi2IrContext, files, deserializer)
+    val moduleFragment = psi2IrContext.generateModuleFragment(files, deserializer)
 
     return IrModuleInfo(moduleFragment, deserializedModuleFragments, irBuiltIns, symbolTable, deserializer)
 }
 
+private fun runAnalysisAndPreparePsi2Ir(depsDescriptors: ModulesStructure): GeneratorContext {
+    val analysisResult = depsDescriptors.runAnalysis()
+
+    return GeneratorContext(
+        Psi2IrConfiguration(),
+        analysisResult.moduleDescriptor,
+        analysisResult.bindingContext,
+        depsDescriptors.compilerConfiguration.languageVersionSettings,
+        SymbolTable(),
+        GeneratorExtensions()
+    )
+}
+
+private fun GeneratorContext.generateModuleFragment(files: List<KtFile>, deserializer: JsIrLinker? = null) =
+    Psi2IrTranslator(languageVersionSettings, configuration).generateModuleFragment(this, files, deserializer)
+
+
 private fun loadKlibMetadataParts(
     moduleId: KlibModuleRef
 ): JsKlibMetadataParts {
@@ -157,8 +167,12 @@ private fun loadKlibMetadata(
 ): ModuleDescriptorImpl {
     assert(isBuiltIn == (builtinsModule === null))
     val builtIns = builtinsModule?.builtIns ?: object : KotlinBuiltIns(storageManager) {}
-    val md = ModuleDescriptorImpl(Name.special("<${moduleId.moduleName}>"), storageManager, builtIns,
-                                  capabilities = mapOf(JS_KLIBRARY_CAPABILITY to File(moduleId.klibPath)))
+    val md = ModuleDescriptorImpl(
+        Name.special("<${moduleId.moduleName}>"),
+        storageManager,
+        builtIns,
+        capabilities = mapOf(JS_KLIBRARY_CAPABILITY to File(moduleId.klibPath))
+    )
     if (isBuiltIn) builtIns.builtInsModule = md
     val currentModuleFragmentProvider = createJsKlibMetadataPackageFragmentProvider(
         storageManager, md, parts.header, parts.body, metadataVersion,
@@ -178,10 +192,10 @@ private fun loadKlibMetadata(
 }
 
 
-class ModulesStructure(
+private class ModulesStructure(
     private val project: Project,
     private val files: List<KtFile>,
-    private val compilerConfiguration: CompilerConfiguration,
+    val compilerConfiguration: CompilerConfiguration,
     immediateDependencies: List<KlibModuleRef>,
     private val allDependencies: List<KlibModuleRef>
 ) {
@@ -265,7 +279,7 @@ fun serializeModuleIntoKlib(
 ) {
     val declarationTable = JsDeclarationTable(moduleFragment.irBuiltins, DescriptorTable())
 
-    val serializedIr = JsIrModuleSerializer(logggg, declarationTable).serializedIrModule(moduleFragment)
+    val serializedIr = JsIrModuleSerializer(emptyLoggingContext, declarationTable).serializedIrModule(moduleFragment)
     val serializer = JsKlibMetadataSerializationUtil
 
     val moduleDescription =