K2: add more accurate & more automatic control of diagnostic suppression

#KT-51363 Fixed

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

@@ -6,15 +6,19 @@
 package org.jetbrains.kotlin.diagnostics
 
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
-import org.jetbrains.kotlin.diagnostics.impl.DiagnosticsCollectorWithSuppress
+import org.jetbrains.kotlin.diagnostics.impl.PendingDiagnosticsCollectorWithSuppress
 import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollector
+import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollectorWithSuppress
 
 object DiagnosticReporterFactory {
     fun createReporter(disableSuppress: Boolean = false): BaseDiagnosticsCollector {
         return if (disableSuppress) {
             SimpleDiagnosticsCollector()
         } else {
-            DiagnosticsCollectorWithSuppress()
+            SimpleDiagnosticsCollectorWithSuppress()
         }
     }
+
+    fun createPendingReporter(): PendingDiagnosticsCollectorWithSuppress =
+        PendingDiagnosticsCollectorWithSuppress()
 }

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.diagnostics.impl
+
+import org.jetbrains.kotlin.AbstractKtSourceElement
+import org.jetbrains.kotlin.diagnostics.DiagnosticContext
+import org.jetbrains.kotlin.diagnostics.KtDiagnostic
+import org.jetbrains.kotlin.diagnostics.Severity
+
+class PendingDiagnosticsCollectorWithSuppress : BaseDiagnosticsCollector() {
+    private val pendingDiagnosticsByFilePath: MutableMap<String?, MutableList<KtDiagnostic>> = mutableMapOf()
+    private val _diagnosticsByFilePath: MutableMap<String?, MutableList<KtDiagnostic>> = mutableMapOf()
+    override val diagnostics: List<KtDiagnostic>
+        get() = _diagnosticsByFilePath.flatMap { it.value }
+    override val diagnosticsByFilePath: Map<String?, List<KtDiagnostic>>
+        get() = _diagnosticsByFilePath
+
+    override var hasErrors = false
+        private set
+
+    override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) {
+        if (diagnostic != null && !context.isDiagnosticSuppressed(diagnostic)) {
+            pendingDiagnosticsByFilePath.getOrPut(context.containingFilePath) { mutableListOf() }.run {
+                add(diagnostic)
+            }
+        }
+    }
+
+    fun checkAndCommitReportsOn(
+        element: AbstractKtSourceElement,
+        context: DiagnosticContext?,
+        commitEverything: Boolean
+    ) {
+        for ((path, pendingList) in pendingDiagnosticsByFilePath) {
+            val committedList = _diagnosticsByFilePath.getOrPut(path) { mutableListOf() }
+            val iterator = pendingList.iterator()
+            while (iterator.hasNext()) {
+                val diagnostic = iterator.next()
+                when {
+                    context?.isDiagnosticSuppressed(diagnostic) == true -> {
+                        if (diagnostic.element == element ||
+                            diagnostic.element.startOffset >= element.startOffset && diagnostic.element.endOffset <= element.endOffset
+                        ) {
+                            iterator.remove()
+                        }
+                    }
+                    diagnostic.element == element || commitEverything -> {
+                        iterator.remove()
+                        committedList += diagnostic
+                        if (!hasErrors && diagnostic.severity == Severity.ERROR) {
+                            hasErrors = true
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticContext
 import org.jetbrains.kotlin.diagnostics.KtDiagnostic
 import org.jetbrains.kotlin.diagnostics.Severity
 
-class DiagnosticsCollectorWithSuppress : BaseDiagnosticsCollector() {
+class SimpleDiagnosticsCollectorWithSuppress : BaseDiagnosticsCollector() {
     private val _diagnosticsByFilePath: MutableMap<String?, MutableList<KtDiagnostic>> = mutableMapOf()
     override val diagnostics: List<KtDiagnostic>
         get() = _diagnosticsByFilePath.flatMap { it.value }