From dabc259ae826a8b7b4e61f420500c573fd79a294 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 3 Nov 2020 16:01:13 +0300
Subject: [PATCH] [FIR] Make diagnostics collectors returns List instead of
 Iterable

---
 .../fir/analysis/collectors/AbstractDiagnosticCollector.kt    | 4 ++--
 .../kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt | 2 +-
 .../fir/analysis/collectors/SimpleDiagnosticsCollector.kt     | 2 +-
 .../api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
index 522612e3483..6c1315998fe 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
@@ -33,7 +33,7 @@ abstract class AbstractDiagnosticCollector(
     override val scopeSession: ScopeSession = ScopeSession(),
     returnTypeCalculator: ReturnTypeCalculator = ReturnTypeCalculatorForFullBodyResolve()
 ) : SessionHolder {
-    fun collectDiagnostics(firFile: FirFile): Iterable<FirDiagnostic<*>> {
+    fun collectDiagnostics(firFile: FirFile): List<FirDiagnostic<*>> {
         if (!componentsInitialized) {
             throw IllegalStateException("Components are not initialized")
         }
@@ -43,7 +43,7 @@ abstract class AbstractDiagnosticCollector(
     }
 
     protected abstract fun initializeCollector()
-    protected abstract fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>>
+    protected abstract fun getCollectedDiagnostics(): List<FirDiagnostic<*>>
     abstract val reporter: DiagnosticReporter
 
     private val components: MutableList<AbstractDiagnosticCollectorComponent> = mutableListOf()
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
index 95d4eb50d3c..92e16c75f01 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.collectors
 import org.jetbrains.kotlin.fir.FirSession
 
 object FirDiagnosticsCollector {
-    fun create(session: FirSession): AbstractDiagnosticCollector {
+    fun create(session: FirSession): SimpleDiagnosticsCollector {
         val collector = SimpleDiagnosticsCollector(session)
         collector.registerAllComponents()
         return collector
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
index 52864444d7e..0f5e62de345 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
@@ -17,7 +17,7 @@ class SimpleDiagnosticsCollector(session: FirSession) : AbstractDiagnosticCollec
         reporter = SimpleDiagnosticReporter()
     }
 
-    override fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>> {
+    override fun getCollectedDiagnostics(): List<FirDiagnostic<*>> {
         return reporter.diagnostics
     }
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
index bcffaf80017..91f22f69474 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
@@ -56,7 +56,7 @@ internal abstract class AbstractFirIdeDiagnosticsCollector(
         checkCanceled()
     }
 
-    override fun getCollectedDiagnostics(): Iterable<FirDiagnostic<*>> {
+    override fun getCollectedDiagnostics(): List<FirDiagnostic<*>> {
         // Not necessary in IDE
         return emptyList()
     }