[IC] Convert OutputItemsCollector and relevant classes to kotlin

Author: demiurg906

build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java

@@ -13,14 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jetbrains.kotlin.compilerRunner
 
 import org.jetbrains.kotlin.build.GeneratedFile
 import org.jetbrains.kotlin.build.GeneratedJvmClass
 import org.jetbrains.kotlin.metadata.deserialization.MetadataVersion
 import java.io.File
 
+interface OutputItemsCollector {
+    fun add(sourceFiles: Collection<File>, outputFile: File)
+}
+
+class OutputItemsCollectorImpl : OutputItemsCollector {
+    val outputs: List<SimpleOutputItem>
+        get() = _outputs
+
+    private val _outputs: MutableList<SimpleOutputItem> = mutableListOf()
+
+    override fun add(sourceFiles: Collection<File>, outputFile: File) {
+        _outputs.add(SimpleOutputItem(sourceFiles, outputFile))
+    }
+}
+
 data class SimpleOutputItem(val sourceFiles: Collection<File>, val outputFile: File) {
     override fun toString(): String =
         "$sourceFiles->$outputFile"
@@ -30,4 +44,4 @@ fun SimpleOutputItem.toGeneratedFile(metadataVersionFromLanguageVersion: Metadat
     when {
         outputFile.name.endsWith(".class") -> GeneratedJvmClass(sourceFiles, outputFile, metadataVersionFromLanguageVersion)
         else -> GeneratedFile(sourceFiles, outputFile)
-    }
+    }

build-common/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.kt renamed to build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.kt

@@ -139,10 +139,9 @@ object CompilerOutputParser {
         }
 
         private fun reportToCollector(text: String) {
-            val output = OutputMessageUtil.parseOutputMessage(text)
-            if (output != null) {
-                collector.add(output.sourceFiles, output.outputFile)
-            }
+            val output = OutputMessageUtil.parseOutputMessage(text) ?: return
+            val outputFile = output.outputFile ?: return
+            collector.add(output.sourceFiles, outputFile)
         }
 
         companion object {