Close kapt writer only once

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt

@@ -46,8 +46,6 @@ public abstract class AnnotationCollectorExtensionBase() : ClassBuilderIntercept
 
     protected abstract val annotationFilterList: List<String>?
 
-    private val classBuilderFactories = arrayListOf<AnnotationCollectorClassBuilderFactory>()
-
     private val shortenedAnnotationCache = ShortenedNameCache(RecordTypes.SHORTENED_ANNOTATION)
     private val shortenedPackageNameCache = ShortenedNameCache(RecordTypes.SHORTENED_PACKAGE_NAME)
 
@@ -56,12 +54,11 @@ public abstract class AnnotationCollectorExtensionBase() : ClassBuilderIntercept
             bindingContext: BindingContext,
             diagnostics: DiagnosticSink
     ): ClassBuilderFactory {
-        val factory = AnnotationCollectorClassBuilderFactory(interceptedFactory, getWriter(diagnostics), diagnostics)
+        return AnnotationCollectorClassBuilderFactory(interceptedFactory, getWriter(diagnostics), diagnostics)
-        classBuilderFactories.add(factory)
-        return factory
     }
 
     protected abstract fun getWriter(diagnostic: DiagnosticSink): Writer
+    protected abstract fun closeWriter()
 
     private inner class AnnotationCollectorClassBuilderFactory(
             private val delegateFactory: ClassBuilderFactory,
@@ -84,11 +81,7 @@ public abstract class AnnotationCollectorExtensionBase() : ClassBuilderIntercept
         }
 
         override fun close() {
-            for (factory in classBuilderFactories) {
+            closeWriter()
-                factory.writer.close()
-            }
-            classBuilderFactories.clear()
-
             delegateFactory.close()
         }
     }
@@ -232,6 +225,10 @@ public class AnnotationCollectorExtension(
 
     private var writerInternal: Writer? = null
 
+    override fun closeWriter() {
+        writerInternal?.close()
+    }
+
     override fun getWriter(diagnostic: DiagnosticSink): Writer {
         return writerInternal ?: try {
             with (File(outputFilename)) {

plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt

@@ -67,6 +67,7 @@ public abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() {
         val stringWriter = StringWriter()
 
         override fun getWriter(diagnostic: DiagnosticSink) = stringWriter
+        override fun closeWriter() {}
 
         override val annotationFilterList = listOf<String>()
     }