From eed143d17b0d05b0b81ef2e30a2d3476055d0866 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 16 Apr 2021 18:03:20 +0200
Subject: [PATCH] FIR: remove
 beforeRunningAllComponentsOnElement/beforeRunningSingleComponentOnElement
 from AbstractDiagnosticCollectorVisitor

---
 .../collectors/AbstractDiagnosticCollectorVisitor.kt   |  3 ---
 .../CheckerRunningDiagnosticCollectorVisitor.kt        |  2 --
 .../level/api/diagnostics/FirIdeDiagnosticVisitor.kt   | 10 +++++-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt
index e7d405acccf..cd6ded0b309 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt
@@ -29,9 +29,6 @@ abstract class AbstractDiagnosticCollectorVisitor(
     protected val components: List<AbstractDiagnosticCollectorComponent>,
 ) : FirDefaultVisitor<Unit, Nothing?>() {
 
-    protected open fun beforeRunningAllComponentsOnElement(element: FirElement) {}
-    protected open fun beforeRunningSingleComponentOnElement(element: FirElement) {}
-
     protected open fun shouldVisitDeclaration(declaration: FirDeclaration) = true
     protected open fun onDeclarationExit(declaration: FirDeclaration) {}
 
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/CheckerRunningDiagnosticCollectorVisitor.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/CheckerRunningDiagnosticCollectorVisitor.kt
index d83146713ce..e0829a8a25f 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/CheckerRunningDiagnosticCollectorVisitor.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/CheckerRunningDiagnosticCollectorVisitor.kt
@@ -19,9 +19,7 @@ open class CheckerRunningDiagnosticCollectorVisitor(
     }
 
     override fun runComponents(element: FirElement) {
-        beforeRunningAllComponentsOnElement(element)
         components.forEach {
-            beforeRunningSingleComponentOnElement(element)
             element.accept(it, context)
         }
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/FirIdeDiagnosticVisitor.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/FirIdeDiagnosticVisitor.kt
index 31f1ce3beb1..f6c5d5e8b68 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/FirIdeDiagnosticVisitor.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/FirIdeDiagnosticVisitor.kt
@@ -18,10 +18,6 @@ internal open class FirIdeDiagnosticVisitor(
 ) : CheckerRunningDiagnosticCollectorVisitor(context, components) {
     private val beforeElementDiagnosticCollectionHandler = context.session.beforeElementDiagnosticCollectionHandler
 
-    override fun beforeRunningSingleComponentOnElement(element: FirElement) {
-        checkCanceled()
-    }
-
     override fun goToNestedDeclarations(element: FirElement) {
         if (element is FirDeclaration) {
             beforeElementDiagnosticCollectionHandler?.beforeGoingNestedDeclaration(element, context)
@@ -29,7 +25,11 @@ internal open class FirIdeDiagnosticVisitor(
         super.goToNestedDeclarations(element)
     }
 
-    override fun beforeRunningAllComponentsOnElement(element: FirElement) {
+    override fun runComponents(element: FirElement) {
         beforeElementDiagnosticCollectionHandler?.beforeCollectingForElement(element)
+        components.forEach {
+            checkCanceled()
+            element.accept(it, context)
+        }
     }
 }
\ No newline at end of file