Introduce BaseDiagnosticsCollector.reportIfNeeded

It required changing of `getEffectiveSeverity` visibility to public

Simplify code of `CompilerConfiguration.reportIfNeeded`

Author: KvanTTT

compiler/cli/src/org/jetbrains/kotlin/cli/common/utils.kt

@@ -26,10 +26,8 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.messages.*
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.config.messageCollector
-import org.jetbrains.kotlin.diagnostics.DiagnosticBaseContext
 import org.jetbrains.kotlin.diagnostics.KtSourcelessDiagnosticFactory
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.packageFqName
@@ -157,10 +155,6 @@ fun disposeRootInWriteAction(disposable: Disposable) {
 }
 
 fun CompilerConfiguration.reportIfNeeded(factory: KtSourcelessDiagnosticFactory, message: String) {
-    val diagnostic = factory.create(message, object : DiagnosticBaseContext {
-        override val languageVersionSettings: LanguageVersionSettings
-            get() = this@reportIfNeeded.languageVersionSettings
-
-    }) ?: return
-    messageCollector.report(diagnostic.severity.toCompilerMessageSeverity(), message)
+    val effectiveSeverity = factory.getEffectiveSeverity(languageVersionSettings) ?: return
+    messageCollector.report(effectiveSeverity.toCompilerMessageSeverity(), message)
 }

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

@@ -29,7 +29,7 @@ sealed class AbstractKtDiagnosticFactory(
         get() = rendererFactory.MAP[this]
             ?: error("Renderer is not found for factory $this inside ${rendererFactory.MAP.name} renderer map")
 
-    protected fun getEffectiveSeverity(languageVersionSettings: LanguageVersionSettings): Severity? {
+    fun getEffectiveSeverity(languageVersionSettings: LanguageVersionSettings): Severity? {
         return when (languageVersionSettings.getFlag(AnalysisFlags.warningLevels)[name]) {
             WarningLevel.Error -> Severity.ERROR
             WarningLevel.Warning -> Severity.FIXED_WARNING

compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/impl/BaseDiagnosticsCollector.kt

@@ -6,8 +6,10 @@
 package org.jetbrains.kotlin.diagnostics.impl
 
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.diagnostics.DiagnosticBaseContext
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.diagnostics.KtDiagnostic
+import org.jetbrains.kotlin.diagnostics.KtSourcelessDiagnosticFactory
 
 abstract class BaseDiagnosticsCollector : DiagnosticReporter() {
     abstract val diagnostics: List<KtDiagnostic>
@@ -29,5 +31,14 @@ abstract class BaseDiagnosticsCollector : DiagnosticReporter() {
         fun reportError(message: String) {
             report(message, CompilerMessageSeverity.ERROR)
         }
+
+        fun reportIfNeeded(
+            factory: KtSourcelessDiagnosticFactory,
+            message: String,
+            context: DiagnosticBaseContext,
+        ) {
+            val refinedSeverity = factory.getEffectiveSeverity(context.languageVersionSettings)?.toCompilerMessageSeverity() ?: return
+            report(message, refinedSeverity)
+        }
     }
 }