[Compiler] Pass OutputFile instead of list of source files to writeAll

Author: demiurg906

compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.cli.common.output
 
 import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.backend.common.output.OutputFile
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -25,11 +26,10 @@ import org.jetbrains.kotlin.incremental.components.ICFileMappingTracker
 import java.io.File
 import java.io.FileNotFoundException
 
-fun OutputFileCollection.writeAll(outputDir: File, report: ((sources: List<File>, output: File) -> Unit)?) {
+fun OutputFileCollection.writeAll(outputDir: File, report: ((outputInfo: OutputFile, output: File) -> Unit)?) {
     for (file in asList()) {
-        val sources = file.sourceFiles
         val output = File(outputDir, file.relativePath)
-        report?.invoke(sources, output)
+        report?.invoke(file, output)
         try {
             FileUtil.writeToFile(output, file.asByteArray())
         } catch (e: FileNotFoundException) {
@@ -45,7 +45,7 @@ fun OutputFileCollection.writeAll(outputDir: File, report: ((sources: List<File>
 }
 
 fun OutputFileCollection.writeAllTo(outputDir: File) {
-    writeAll(outputDir, null)
+    writeAll(outputDir, report = null)
 }
 
 fun OutputFileCollection.writeAll(
@@ -56,10 +56,10 @@ fun OutputFileCollection.writeAll(
 ) {
     try {
         if (!reportOutputFiles && fileMappingTracker == null) writeAllTo(outputDir)
-        else writeAll(outputDir) { sources, output ->
-            fileMappingTracker?.recordSourceFilesToOutputFileMapping(sources, output)
+        else writeAll(outputDir) { outputInfo, output ->
+            fileMappingTracker?.recordSourceFilesToOutputFileMapping(outputInfo.sourceFiles, output)
             if (reportOutputFiles) {
-                messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output))
+                messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(outputInfo.sourceFiles, output))
             }
         }
     } catch (e: NoPermissionException) {

plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/FirKaptAnalysisHandlerExtension.kt

@@ -275,13 +275,13 @@ open class FirKaptAnalysisHandlerExtension(
         val incrementalDataOutputDir = options.incrementalDataOutputDir ?: return
 
         val reportOutputFiles = kaptContext.generationState.configuration.getBoolean(CommonConfigurationKeys.REPORT_OUTPUT_FILES)
-        kaptContext.generationState.factory.writeAll(incrementalDataOutputDir) { sources, output ->
+        kaptContext.generationState.factory.writeAll(incrementalDataOutputDir) { outputInfo, output ->
             kaptContext.generationState.configuration.fileMappingTracker?.recordSourceFilesToOutputFileMapping(
-                sources,
+                outputInfo.sourceFiles,
                 output
             )
             if (reportOutputFiles) {
-                messageCollector.report(OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output))
+                messageCollector.report(OUTPUT, OutputMessageUtil.formatOutputMessage(outputInfo.sourceFiles, output))
             }
         }
     }

plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/KaptExtension.kt

@@ -325,13 +325,13 @@ abstract class AbstractKaptExtension(
         val incrementalDataOutputDir = options.incrementalDataOutputDir ?: return
 
         val reportOutputFiles = kaptContext.generationState.configuration.getBoolean(CommonConfigurationKeys.REPORT_OUTPUT_FILES)
-        kaptContext.generationState.factory.writeAll(incrementalDataOutputDir) { sources, output ->
+        kaptContext.generationState.factory.writeAll(incrementalDataOutputDir) { outputInfo, output ->
             kaptContext.generationState.configuration.fileMappingTracker?.recordSourceFilesToOutputFileMapping(
-                sources,
+                outputInfo.sourceFiles,
                 output
             )
             if (reportOutputFiles) {
-                messageCollector.report(OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output))
+                messageCollector.report(OUTPUT, OutputMessageUtil.formatOutputMessage(outputInfo.sourceFiles, output))
             }
         }
     }