[Test] Clarify property names of FirOutputArtifact

demiurg906 · demiurg906 · commit 3ddc29fe4cac · 2025-11-11T09:11:44.000+02:00
^KT-58886
diff --git a/analysis/low-level-api-fir/testFixtures/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LLFirPhaseVerifier.kt b/analysis/low-level-api-fir/testFixtures/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LLFirPhaseVerifier.kt
@@ -36,7 +36,7 @@ internal class LLFirPhaseVerifier(testServices: TestServices) : FirAnalysisHandl
 
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
         val visitor = Visitor()
-        for (firFile in info.mainFirFiles.values) {
+        for (firFile in info.mainFirFilesByTestFile.values) {
             firFile.accept(visitor)
         }
 
@@ -69,4 +69,4 @@ internal class LLFirPhaseVerifier(testServices: TestServices) : FirAnalysisHandl
             element.acceptChildren(this)
         }
     }
-}
+}
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/backend/handlers/InterpreterDumpHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/backend/handlers/InterpreterDumpHandler.kt
@@ -9,7 +9,6 @@ import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.codeMetaInfo.model.ParsedCodeMetaInfo
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.constant.AnnotationValue
 import org.jetbrains.kotlin.constant.ErrorValue
 import org.jetbrains.kotlin.constant.EvaluatedConstTracker
@@ -22,7 +21,6 @@ import org.jetbrains.kotlin.fir.declarations.utils.evaluatedInitializer
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.FirLiteralExpression
-import org.jetbrains.kotlin.fir.languageVersionSettings
 import org.jetbrains.kotlin.fir.expressions.FirExpressionEvaluator
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.unwrapOr
@@ -165,7 +163,7 @@ class FirInterpreterDumpHandler(testServices: TestServices) : FirAnalysisHandler
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
         val results = buildMap {
             info.partsForDependsOnModules.forEach {
-                it.firFiles.forEach { (testFile, firFile) ->
+                it.firFilesByTestFile.forEach { (testFile, firFile) ->
                     putAll(processFile(testFile, firFile, it.session))
                 }
             }
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrResultsConverter.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/AbstractFir2IrResultsConverter.kt
@@ -179,7 +179,7 @@ fun TestModule.irGenerationExtensions(testServices: TestServices): Collection<Ir
 
 fun FirOutputArtifact.toFirResult(): AllModulesFrontendOutput {
     val outputs = partsForDependsOnModules.map {
-        SingleModuleFrontendOutput(it.session, it.scopeSession, it.firFiles.values.toList())
+        SingleModuleFrontendOutput(it.session, it.scopeSession, it.firFilesByTestFile.values.toList())
     }
     return AllModulesFrontendOutput(outputs)
 }
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJvmResultsConverter.kt
@@ -85,7 +85,7 @@ internal class Fir2IrJvmResultsConverter(testServices: TestServices) : AbstractF
         fir2KlibMetadataSerializer: Fir2KlibMetadataSerializer,
     ): IrBackendInput {
         // TODO: handle fir from light tree
-        val sourceFiles = inputArtifact.mainFirFiles.mapNotNull { it.value.sourceFile }
+        val sourceFiles = inputArtifact.mainFirFilesByTestFile.mapNotNull { it.value.sourceFile }
 
         val backendInput = JvmIrCodegenFactory.BackendInput(
             fir2IrResult.irModuleFragment,
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/FirCliFacade.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/FirCliFacade.kt
@@ -86,7 +86,7 @@ fun SingleModuleFrontendOutput.toTestOutputPart(
         session = session,
         scopeSession = scopeSession,
         firAnalyzerFacade = null,
-        firFiles = testFilePerFirFile.toMap()
+        firFilesByTestFile = testFilePerFirFile.toMap()
     )
 }
 
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/FirOutputArtifact.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/FirOutputArtifact.kt
@@ -20,16 +20,16 @@ data class FirOutputPartForDependsOnModule(
     val session: FirSession,
     val scopeSession: ScopeSession,
     val firAnalyzerFacade: AbstractFirAnalyzerFacade?, // used only in AA tests
-    val firFiles: Map<TestFile, FirFile>
+    val firFilesByTestFile: Map<TestFile, FirFile>
 )
 
 abstract class FirOutputArtifact(val partsForDependsOnModules: List<FirOutputPartForDependsOnModule>) : ResultingArtifact.FrontendOutput<FirOutputArtifact>() {
-    val allFirFiles: Map<TestFile, FirFile> = partsForDependsOnModules.fold(emptyMap()) { acc, part -> acc + part.firFiles }
+    val allFirFilesByTestFile: Map<TestFile, FirFile> = partsForDependsOnModules.fold(emptyMap()) { acc, part -> acc + part.firFilesByTestFile }
 
     override val kind: FrontendKinds.FIR
         get() = FrontendKinds.FIR
 
-    val mainFirFiles: Map<TestFile, FirFile> by lazy { allFirFiles.filterKeys { !it.isAdditional } }
+    val mainFirFilesByTestFile: Map<TestFile, FirFile> by lazy { allFirFilesByTestFile.filterKeys { !it.isAdditional } }
 }
 
 class FirOutputArtifactImpl(parts: List<FirOutputPartForDependsOnModule>) : FirOutputArtifact(parts)
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/TagsGeneratorChecker.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/TagsGeneratorChecker.kt
@@ -73,7 +73,7 @@ class TagsGeneratorChecker(testServices: TestServices) : FirAnalysisHandler(test
 
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
         if (FirDiagnosticsDirectives.DISABLE_GENERATED_FIR_TAGS in module.directives || shouldSkip) return
-        for (file in info.allFirFiles.values) {
+        for (file in info.allFirFilesByTestFile.values) {
             val session = file.moduleData.session
             val visitor = TagsCollectorVisitor(session)
             file.accept(visitor)
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgConsistencyHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgConsistencyHandler.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.test.services.TestServices
 
 class FirCfgConsistencyHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
-        info.mainFirFiles.values.forEach { it.accept(FirCfgConsistencyChecker(assertions)) }
+        info.mainFirFilesByTestFile.values.forEach { it.accept(FirCfgConsistencyChecker(assertions)) }
     }
 
     override fun processAfterAllModules(someAssertionWasFailed: Boolean) {}
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt
@@ -32,7 +32,7 @@ class FirCfgDumpHandler(testServices: TestServices) : FirAnalysisHandler(testSer
         if (alreadyDumped || DUMP_CFG !in module.directives) return
         val options = module.directives[DUMP_CFG].map { it.uppercase() }
 
-        val file = info.mainFirFiles.values.first()
+        val file = info.mainFirFilesByTestFile.values.first()
         val renderLevels = DumpCfgOption.LEVELS in options
         val renderFlow = DumpCfgOption.FLOW in options
         file.renderControlFlowGraphTo(builder, ControlFlowGraphRenderOptions(renderLevels, renderFlow))
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
@@ -161,7 +161,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes
             val forceRenderArguments = FirDiagnosticsDirectives.RENDER_DIAGNOSTICS_MESSAGES in currentModule.directives
 
             for (file in currentModule.files) {
-                val firFile = info.mainFirFiles[file] ?: continue
+                val firFile = info.mainFirFilesByTestFile[file] ?: continue
                 var diagnostics = frontendDiagnosticsPerFile[firFile]
                 if (AdditionalFilesDirectives.CHECK_TYPE in currentModule.directives) {
                     diagnostics = diagnostics.filter { it.diagnostic.factory.name != FirErrors.UNDERSCORE_USAGE_WITHOUT_BACKTICKS.name }
@@ -641,7 +641,7 @@ open class FirDiagnosticCollectorService(val testServices: TestServices) : TestS
     }
 
     private fun computeDiagnostics(info: FirOutputArtifact): ListMultimap<FirFile, DiagnosticWithKmpCompilationMode> {
-        val allFiles = info.partsForDependsOnModules.flatMap { it.firFiles.values }
+        val allFiles = info.partsForDependsOnModules.flatMap { it.firFilesByTestFile.values }
         val platformPart = info.partsForDependsOnModules.last()
         val lazyDeclarationResolver = platformPart.session.lazyDeclarationResolver
         val result = listMultimapOf<FirFile, DiagnosticWithKmpCompilationMode>()
@@ -686,7 +686,7 @@ open class FirDiagnosticCollectorService(val testServices: TestServices) : TestS
                         if (!part.session.languageVersionSettings.getFlag(AnalysisFlags.headerMode)) {
                             result += part.session.runCheckers(
                                 part.scopeSession,
-                                part.firFiles.values,
+                                part.firFilesByTestFile.values,
                                 DiagnosticReporterFactory.createPendingReporter(messageCollector),
                                 mppCheckerKind = MppCheckerKind.Common
                             ).convertToTestDiagnostics(KmpCompilationMode.PLATFORM)
@@ -704,7 +704,7 @@ open class FirDiagnosticCollectorService(val testServices: TestServices) : TestS
                     part.session.turnOnMetadataCompilationAnalysisFlag {
                         result += part.session.runCheckers(
                             part.scopeSession,
-                            part.firFiles.values,
+                            part.firFilesByTestFile.values,
                             DiagnosticReporterFactory.createPendingReporter(messageCollector),
                             mppCheckerKind = MppCheckerKind.Platform
                         ).convertToTestDiagnostics(KmpCompilationMode.METADATA)
@@ -746,7 +746,7 @@ open class FirDiagnosticCollectorService(val testServices: TestServices) : TestS
         part: FirOutputPartForDependsOnModule,
         destination: ListMultimap<FirFile, DiagnosticWithKmpCompilationMode>,
     ) {
-        for ((testFile, firFile) in part.firFiles) {
+        for ((testFile, firFile) in part.firFilesByTestFile) {
             val syntaxErrors = if (firFile.psi != null) {
                 AnalyzingUtils.getSyntaxErrorRanges(firFile.psi!!).map {
                     @OptIn(InternalDiagnosticFactoryMethod::class)
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt
@@ -55,7 +55,7 @@ class FirDumpHandler(
             if (!isFirDumpEnabled) return
 
             val builderForModule = dumper.builderForModule(currentModule)
-            val firFiles = info.mainFirFiles
+            val firFiles = info.mainFirFilesByTestFile
 
             val allFiles = buildList {
                 addAll(firFiles.values)
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirResolvedTypesVerifier.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirResolvedTypesVerifier.kt
@@ -28,7 +28,7 @@ class FirResolvedTypesVerifier(testServices: TestServices) : FirAnalysisHandler(
 
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
         val visitor = Visitor()
-        for (firFile in info.mainFirFiles.values) {
+        for (firFile in info.mainFirFilesByTestFile.values) {
             firFile.acceptChildren(visitor, firFile)
         }
         val ignored = IGNORE_LEAKED_INTERNAL_TYPES in module.directives
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirVFirDumpHandler.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/fir/handlers/FirVFirDumpHandler.kt
@@ -28,7 +28,7 @@ class FirVFirDumpHandler(
             val currentModule = part.module
             if (FirDiagnosticsDirectives.DUMP_VFIR !in currentModule.directives) return
             val builderForModule = dumper.builderForModule(currentModule)
-            val firFiles = info.mainFirFiles
+            val firFiles = info.mainFirFilesByTestFile
 
             val allFiles = buildList {
                 addAll(firFiles.values)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ internal class LLFirPhaseVerifier(testServices: TestServices) : FirAnalysisHandl`
`36`	`36`
`37`	`37`	`override fun processModule(module: TestModule, info: FirOutputArtifact) {`
`38`	`38`	`val visitor = Visitor()`
`39`		`- for (firFile in info.mainFirFiles.values) {`
	`39`	`+ for (firFile in info.mainFirFilesByTestFile.values) {`
`40`	`40`	`firFile.accept(visitor)`
`41`	`41`	`}`
`42`	`42`
`@@ -69,4 +69,4 @@ internal class LLFirPhaseVerifier(testServices: TestServices) : FirAnalysisHandl`
`69`	`69`	`element.acceptChildren(this)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`-}`
	`72`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ fun TestModule.irGenerationExtensions(testServices: TestServices): Collection<Ir`
`179`	`179`
`180`	`180`	`fun FirOutputArtifact.toFirResult(): AllModulesFrontendOutput {`
`181`	`181`	`val outputs = partsForDependsOnModules.map {`
`182`		`- SingleModuleFrontendOutput(it.session, it.scopeSession, it.firFiles.values.toList())`
	`182`	`+ SingleModuleFrontendOutput(it.session, it.scopeSession, it.firFilesByTestFile.values.toList())`
`183`	`183`	`}`
`184`	`184`	`return AllModulesFrontendOutput(outputs)`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ fun SingleModuleFrontendOutput.toTestOutputPart(`
`86`	`86`	`session = session,`
`87`	`87`	`scopeSession = scopeSession,`
`88`	`88`	`firAnalyzerFacade = null,`
`89`		`- firFiles = testFilePerFirFile.toMap()`
	`89`	`+ firFilesByTestFile = testFilePerFirFile.toMap()`
`90`	`90`	`)`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.test.services.TestServices`
`12`	`12`
`13`	`13`	`class FirCfgConsistencyHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {`
`14`	`14`	`override fun processModule(module: TestModule, info: FirOutputArtifact) {`
`15`		`- info.mainFirFiles.values.forEach { it.accept(FirCfgConsistencyChecker(assertions)) }`
	`15`	`+ info.mainFirFilesByTestFile.values.forEach { it.accept(FirCfgConsistencyChecker(assertions)) }`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`override fun processAfterAllModules(someAssertionWasFailed: Boolean) {}`