From 8eabe08e7aa3ac89a19dd3acb32887515d6407eb Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 29 Oct 2019 16:00:13 +0300
Subject: [PATCH] [FIR] Move components into separate package

---
 .../collectors/AbstractDiagnosticCollector.kt |  9 +--------
 .../AbstractDiagnosticCollectorComponent.kt   | 19 +++++++++++++++++++
 .../DeclarationCheckersDiagnosticComponent.kt |  1 -
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/AbstractDiagnosticCollectorComponent.kt

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/AbstractDiagnosticCollector.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/AbstractDiagnosticCollector.kt
index 09c3a7b3c61..08f8b2a8951 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/AbstractDiagnosticCollector.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/AbstractDiagnosticCollector.kt
@@ -9,16 +9,9 @@ import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeDiagnostic
 import org.jetbrains.kotlin.fir.resolve.diagnostics.DiagnosticReporter
+import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.components.AbstractDiagnosticCollectorComponent
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
 
-abstract class AbstractDiagnosticCollectorComponent(private val collector: AbstractDiagnosticCollector) : FirVisitorVoid() {
-    override fun visitElement(element: FirElement) {}
-
-    protected fun runCheck(block: (DiagnosticReporter) -> Unit) {
-        collector.runCheck(block)
-    }
-}
-
 abstract class AbstractDiagnosticCollector {
     fun collectDiagnostics(firFile: FirFile): Iterable<ConeDiagnostic> {
         if (!componentsInitialized) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/AbstractDiagnosticCollectorComponent.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/AbstractDiagnosticCollectorComponent.kt
new file mode 100644
index 00000000000..a77c023873d
--- /dev/null
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/AbstractDiagnosticCollectorComponent.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2019 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.fir.resolve.diagnostics.collectors.components
+
+import org.jetbrains.kotlin.fir.FirElement
+import org.jetbrains.kotlin.fir.resolve.diagnostics.DiagnosticReporter
+import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.AbstractDiagnosticCollector
+import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
+
+abstract class AbstractDiagnosticCollectorComponent(private val collector: AbstractDiagnosticCollector) : FirVisitorVoid() {
+    override fun visitElement(element: FirElement) {}
+
+    protected fun runCheck(block: (DiagnosticReporter) -> Unit) {
+        collector.runCheck(block)
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/DeclarationCheckersDiagnosticComponent.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/DeclarationCheckersDiagnosticComponent.kt
index a4ca70f695a..91e7da1ffe5 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/DeclarationCheckersDiagnosticComponent.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/components/DeclarationCheckersDiagnosticComponent.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.resolve.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.resolve.diagnostics.checkers.declaration.DeclarationCheckers
 import org.jetbrains.kotlin.fir.resolve.diagnostics.checkers.declaration.FirDeclarationChecker
 import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.AbstractDiagnosticCollector
-import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.AbstractDiagnosticCollectorComponent
 
 class DeclarationCheckersDiagnosticComponent(collector: AbstractDiagnosticCollector) : AbstractDiagnosticCollectorComponent(collector) {
     override fun visitProperty(property: FirProperty) {