From b25e460beba5468bd26d0d8a1e16cfa7eb92317e Mon Sep 17 00:00:00 2001
From: Ivan Kochurkin <ivan.kochurkin@jetbrains.com>
Date: Mon, 30 Jan 2023 21:47:11 +0100
Subject: [PATCH] [FIR2IR] Minor: simplify code

---
 .../kotlin/fir/backend/Fir2IrConverter.kt     | 25 ++++++-------------
 .../test/frontend/fir/FirFrontendFacade.kt    | 12 ++-------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
index 92b96e4a97b..9d236f690d3 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
@@ -453,15 +453,11 @@ class Fir2IrConverter(
             val converter = Fir2IrConverter(moduleDescriptor, components)
 
             components.converter = converter
-
-            val classifierStorage = Fir2IrClassifierStorage(components, commonMemberStorage)
-            components.classifierStorage = classifierStorage
+            components.classifierStorage = Fir2IrClassifierStorage(components, commonMemberStorage)
             components.delegatedMemberGenerator = DelegatedMemberGenerator(components)
-            val declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor, commonMemberStorage)
-            components.declarationStorage = declarationStorage
+            components.declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor, commonMemberStorage)
             components.visibilityConverter = visibilityConverter
-            val typeConverter = Fir2IrTypeConverter(components)
-            components.typeConverter = typeConverter
+            components.typeConverter = Fir2IrTypeConverter(components)
             val irBuiltIns = initializedIrBuiltIns ?: IrBuiltInsOverFir(
                 components, languageVersionSettings, moduleDescriptor, irMangler,
                 languageVersionSettings.getFlag(AnalysisFlags.builtInsFromSources) || kotlinBuiltIns !== DefaultBuiltIns.Instance
@@ -469,16 +465,11 @@ class Fir2IrConverter(
             components.irBuiltIns = irBuiltIns
             val conversionScope = Fir2IrConversionScope()
             val fir2irVisitor = Fir2IrVisitor(components, conversionScope)
-            val builtIns = Fir2IrBuiltIns(components, specialSymbolProvider)
-            val annotationGenerator = AnnotationGenerator(components)
-            components.builtIns = builtIns
-            components.annotationGenerator = annotationGenerator
-            val fakeOverrideGenerator = FakeOverrideGenerator(components, conversionScope)
-            components.fakeOverrideGenerator = fakeOverrideGenerator
-            val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
-            components.callGenerator = callGenerator
-            val irProvider = FirIrProvider(components)
-            components.irProviders = listOf(irProvider)
+            components.builtIns = Fir2IrBuiltIns(components, specialSymbolProvider)
+            components.annotationGenerator = AnnotationGenerator(components)
+            components.fakeOverrideGenerator = FakeOverrideGenerator(components, conversionScope)
+            components.callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
+            components.irProviders = listOf(FirIrProvider(components))
 
             fir2IrExtensions.registerDeclarations(commonMemberStorage.symbolTable)
 
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
index d03e338ccea..21781c65087 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
@@ -95,16 +95,8 @@ open class FirFrontendFacade(
         )
 
         val targetPlatform = module.targetPlatform
-        val firOutputPartForDependsOnModules = mutableListOf<FirOutputPartForDependsOnModule>()
-        for (testModule in sortedModules) {
-            firOutputPartForDependsOnModules.add(
-                analyze(
-                    testModule,
-                    moduleDataMap[testModule]!!,
-                    targetPlatform,
-                    projectEnvironment
-                )
-            )
+        val firOutputPartForDependsOnModules = sortedModules.map {
+            analyze(it, moduleDataMap[it]!!, targetPlatform, projectEnvironment)
         }
 
         return FirOutputArtifactImpl(firOutputPartForDependsOnModules)