Rr/demiurg906/sourceless diagnostics follow up

compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticReporterFactory.kt

@@ -5,18 +5,12 @@
 
 package org.jetbrains.kotlin.diagnostics
 
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.diagnostics.impl.PendingDiagnosticsCollectorWithSuppress
 import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollector
 import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollectorWithSuppress
 
 object DiagnosticReporterFactory {
-    // kept only to keep compatibility with Compose tests
-    fun createReporter(messageCollector: MessageCollector): BaseDiagnosticsCollector {
-        return createReporter()
-    }
-
     fun createReporter(disableSuppress: Boolean = false): BaseDiagnosticsCollector {
         return if (disableSuppress) {
             SimpleDiagnosticsCollector()

compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt

@@ -12,11 +12,11 @@ import org.junit.Assert
 import kotlin.reflect.KProperty
 import kotlin.reflect.full.memberProperties
 
-fun verifyDiagnostics(vararg rendererToContainerMap: Pair<KtDiagnosticFactoryToRendererMap, KtDiagnosticsContainer>) {
+fun verifyDiagnostics(vararg diagnosticContainers: KtDiagnosticsContainer) {
     val errors = mutableListOf<String>()
     val existingDiagnosticFactories = mutableMapOf<String, AbstractKtDiagnosticFactory>()
-    for ((renderer, container) in rendererToContainerMap) {
-        renderer.verifyMessages(container, errors, existingDiagnosticFactories)
+    for (container in diagnosticContainers) {
+        container.getRendererFactory().MAP.verifyMessages(container, errors, existingDiagnosticFactories)
     }
     if (errors.isNotEmpty()) {
         Assert.fail(

compiler/tests/org/jetbrains/kotlin/checkers/DefaultDiagnosticsTest.kt

@@ -7,35 +7,27 @@ package org.jetbrains.kotlin.checkers
 
 import org.jetbrains.kotlin.fir.analysis.diagnostics.CliDiagnostics
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrorsDefaultMessages
-import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticMessagesCli
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.native.FirNativeErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.native.FirNativeErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.builder.FirSyntaxErrors
-import org.jetbrains.kotlin.fir.builder.FirSyntaxErrorsDefaultMessages
 import org.jetbrains.kotlin.test.utils.verifyDiagnostics
 import org.junit.Test
 
 class DefaultDiagnosticsTest {
     @Test
     fun verify() {
         verifyDiagnostics(
-            FirErrorsDefaultMessages.MAP to FirErrors,
-            FirJvmErrorsDefaultMessages.MAP to FirJvmErrors,
-            FirJsErrorsDefaultMessages.MAP to FirJsErrors,
-            FirNativeErrorsDefaultMessages.MAP to FirNativeErrors,
-            FirWasmErrorsDefaultMessages.MAP to FirWasmErrors,
-            FirWebCommonErrorsDefaultMessages.MAP to FirWebCommonErrors,
-            FirSyntaxErrorsDefaultMessages.MAP to FirSyntaxErrors,
-            KtDiagnosticMessagesCli.MAP to CliDiagnostics
+            FirErrors,
+            FirJvmErrors,
+            FirJsErrors,
+            FirNativeErrors,
+            FirWasmErrors,
+            FirWebCommonErrors,
+            FirSyntaxErrors,
+            CliDiagnostics
         )
     }
 }

plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/K2CompilerFacade.kt

@@ -165,8 +165,7 @@ class K2CompilerFacade(environment: KotlinCoreEnvironment) : KotlinCompilerFacad
         val commonKtFiles = commonFiles.map { it.toKtFile(project) }
         val platformKtFiles = platformFiles.map { it.toKtFile(project) }
 
-        val messageCollector = configuration.getNotNull(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-        val reporter = DiagnosticReporterFactory.createReporter(messageCollector)
+        val reporter = DiagnosticReporterFactory.createReporter()
         val commonAnalysis =
             buildResolveAndCheckFirFromKtFiles(commonSession, commonKtFiles, reporter)
         val platformAnalysis =

plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokDiagnosticsTest.kt

@@ -13,6 +13,6 @@ import org.junit.jupiter.api.Test
 class LombokDiagnosticsTest {
     @Test
     fun verify() {
-        verifyDiagnostics(KtDiagnosticMessagesLombok.MAP to LombokDiagnostics)
+        verifyDiagnostics(LombokDiagnostics)
     }
-}
+}

plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeDiagnosticsTest.kt

@@ -5,14 +5,13 @@
 
 package org.jetbrains.kotlin.parcelize.test
 
-import org.jetbrains.kotlin.parcelize.fir.diagnostics.KtDefaultErrorMessagesParcelize
 import org.jetbrains.kotlin.parcelize.fir.diagnostics.KtErrorsParcelize
 import org.jetbrains.kotlin.test.utils.verifyDiagnostics
 import org.junit.jupiter.api.Test
 
 class ParcelizeDiagnosticsTest {
     @Test
     fun verify() {
-        verifyDiagnostics(KtDefaultErrorMessagesParcelize.MAP to KtErrorsParcelize)
+        verifyDiagnostics(KtErrorsParcelize)
     }
 }