From 70fa12d9d2ddf0d5cbf91e4169b44542ffeb3a5e Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 3 Dec 2019 14:06:36 +0300
Subject: [PATCH] Extract FirDiagnosticsCollector to have creation logic in one
 place

---
 .../collectors/FirDiagnosticsCollector.kt     | 22 +++++++++++++++++++
 .../kotlin/fir/AbstractFirDiagnosticTest.kt   |  6 ++---
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/FirDiagnosticsCollector.kt

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/FirDiagnosticsCollector.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/FirDiagnosticsCollector.kt
new file mode 100644
index 00000000000..0435c7150eb
--- /dev/null
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/collectors/FirDiagnosticsCollector.kt
@@ -0,0 +1,22 @@
+/*
+ * 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
+
+object FirDiagnosticsCollector {
+    fun create(): AbstractDiagnosticCollector {
+        val collector = SimpleDiagnosticsCollector()
+        collector.registerAllComponents()
+        return collector
+    }
+
+    // Use in CLI compiler
+    @Suppress("unused")
+    fun createParallel(): AbstractDiagnosticCollector {
+        val collector = ParallelDiagnosticsCollector(4)
+        collector.registerAllComponents()
+        return collector
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
index d1ecad9b8e2..dc164a0b98c 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.AbstractDiagnosticCollector
+import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.FirDiagnosticsCollector
 import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.ParallelDiagnosticsCollector
 import org.jetbrains.kotlin.fir.resolve.diagnostics.collectors.registerAllComponents
 import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer
@@ -50,9 +51,6 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
     }
 
     private fun createCollector(): AbstractDiagnosticCollector {
-//        val collector = SimpleDiagnosticsCollector()
-        val collector = ParallelDiagnosticsCollector(4)
-        collector.registerAllComponents()
-        return collector
+        return FirDiagnosticsCollector.create()
     }
 }
\ No newline at end of file