Annotation collector compiler plugin

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java

@@ -49,6 +49,11 @@ public class ClassBuilderFactories {
         public byte[] asBytes(ClassBuilder builder) {
             throw new IllegalStateException();
         }
+
+        @Override
+        public void close() {
+            throw new IllegalStateException();
+        }
     };
 
     @NotNull
@@ -79,6 +84,11 @@ public class ClassBuilderFactories {
         public byte[] asBytes(ClassBuilder builder) {
             return ((TraceBuilder) builder).binary.toByteArray();
         }
+
+        @Override
+        public void close() {
+
+        }
     };
 
     @NotNull
@@ -105,6 +115,11 @@ public class ClassBuilderFactories {
             ClassWriter visitor = (ClassWriter) builder.getVisitor();
             return visitor.toByteArray();
         }
+
+        @Override
+        public void close() {
+
+        }
     };
 
     private ClassBuilderFactories() {

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java

@@ -29,4 +29,6 @@ public interface ClassBuilderFactory {
     String asText(ClassBuilder builder);
 
     byte[] asBytes(ClassBuilder builder);
+
+    void close();
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt

@@ -47,6 +47,10 @@ public abstract class SignatureCollectingClassBuilderFactory(
         return delegate.asText((builder as SignatureCollectingClassBuilder)._delegate)
     }
 
+    public override fun close() {
+        delegate.close()
+    }
+
     private inner class SignatureCollectingClassBuilder(
             private val classCreatedFor: JvmDeclarationOrigin,
             internal val _delegate: ClassBuilder

compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ClassBuilderInterceptorExtension.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen.extensions
+
+import org.jetbrains.kotlin.codegen.ClassBuilderFactory
+import org.jetbrains.kotlin.diagnostics.DiagnosticSink
+import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
+import org.jetbrains.kotlin.resolve.BindingContext
+
+public trait ClassBuilderInterceptorExtension {
+    companion object : ProjectExtensionDescriptor<ClassBuilderInterceptorExtension>(
+            "org.jetbrains.kotlin.classBuilderFactoryInterceptorExtension", javaClass<ClassBuilderInterceptorExtension>())
+
+    public fun interceptClassBuilderFactory(
+            interceptedFactory: ClassBuilderFactory,
+            bindingContext: BindingContext,
+            diagnostics: DiagnosticSink
+    ): ClassBuilderFactory
+
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java

@@ -50,4 +50,9 @@ public class OptimizationClassBuilderFactory implements ClassBuilderFactory {
     public byte[] asBytes(ClassBuilder builder) {
         return delegate.asBytes(((OptimizationClassBuilder) builder).getDelegate());
     }
+
+    @Override
+    public void close() {
+        delegate.close();
+    }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java

@@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.*;
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension;
 import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
 import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory;
 import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum;
@@ -138,6 +139,9 @@ public class GenerationState {
     @Nullable
     private final File outDirectory; // TODO: temporary hack, see JetTypeMapperWithOutDirectory state for details
 
+    @NotNull
+    private final ClassBuilderFactory interceptedBuilderFactory;
+
     public GenerationState(
             @NotNull Project project,
             @NotNull ClassBuilderFactory builderFactory,
@@ -187,9 +191,20 @@ public class GenerationState {
             builderFactory = new OptimizationClassBuilderFactory(builderFactory);
         }
 
+        ClassBuilderFactory interceptedBuilderFactory = new BuilderFactoryForDuplicateSignatureDiagnostics(
+                builderFactory, this.bindingContext, diagnostics);
+
+        Collection<ClassBuilderInterceptorExtension> interceptExtensions =
+                ClassBuilderInterceptorExtension.Companion.getInstances(project);
+
+        for (ClassBuilderInterceptorExtension extension : interceptExtensions) {
+            interceptedBuilderFactory = extension.interceptClassBuilderFactory(interceptedBuilderFactory, bindingContext, diagnostics);
+        }
+
+        this.interceptedBuilderFactory = interceptedBuilderFactory;
+
         this.diagnostics = diagnostics;
-        this.classFileFactory = new ClassFileFactory(this, new BuilderFactoryForDuplicateSignatureDiagnostics(
-                builderFactory, this.bindingContext, diagnostics));
+        this.classFileFactory = new ClassFileFactory(this, interceptedBuilderFactory);
 
         this.disableCallAssertions = disableCallAssertions;
         this.disableParamAssertions = disableParamAssertions;
@@ -306,6 +321,7 @@ public class GenerationState {
     }
 
     public void destroy() {
+        interceptedBuilderFactory.close();
     }
 
     @Nullable

compiler/cli/cli.iml

@@ -19,5 +19,6 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="annotation-collector" />
   </component>
 </module>

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt

@@ -21,6 +21,8 @@ import java.util.jar.JarFile
 import java.util.jar.Attributes
 import java.util.regex.Pattern
 import com.intellij.util.containers.MultiMap
+import org.jetbrains.kotlin.annotation.AnnotationCollectorCommandLineProcessor
+import org.jetbrains.kotlin.annotation.AnnotationCollectorComponentRegistrar
 import java.net.URLClassLoader
 import java.net.URL
 import java.io.File
@@ -45,10 +47,9 @@ public object PluginCliParser {
                 javaClass.getClassLoader()
         )
 
-        configuration.addAll(
-                ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS,
-                ServiceLoader.load(javaClass<ComponentRegistrar>(), classLoader).toList()
-        )
+        val componentRegistrars = ServiceLoader.load(javaClass<ComponentRegistrar>(), classLoader).toArrayList()
+        componentRegistrars.add(AnnotationCollectorComponentRegistrar())
+        configuration.addAll(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, componentRegistrars)
 
         processPluginOptions(arguments, configuration, classLoader)
     }
@@ -63,7 +64,8 @@ public object PluginCliParser {
             it.pluginId
         } ?: mapOf()
 
-        val commandLineProcessors = ServiceLoader.load(javaClass<CommandLineProcessor>(), classLoader).toList()
+        val commandLineProcessors = ServiceLoader.load(javaClass<CommandLineProcessor>(), classLoader).toArrayList()
+        commandLineProcessors.add(AnnotationCollectorCommandLineProcessor())
 
         for (processor in commandLineProcessors) {
             val declaredOptions = processor.pluginOptions.valuesToMap { it.name }

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -63,6 +63,7 @@ import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
 import org.jetbrains.kotlin.cli.jvm.config.JvmContentRoot
+import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
@@ -139,6 +140,7 @@ public class KotlinCoreEnvironment private(
 
         ExternalDeclarationsProvider.registerExtensionPoint(project)
         ExpressionCodegenExtension.registerExtensionPoint(project)
+        ClassBuilderInterceptorExtension.registerExtensionPoint(project)
 
         for (registrar in configuration.getList(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS)) {
             registrar.registerProjectComponents(project, configuration)

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java

@@ -52,4 +52,9 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
     public byte[] asBytes(ClassBuilder builder) {
         throw new UnsupportedOperationException("asBytes is not implemented"); // TODO
     }
+
+    @Override
+    public void close() {
+
+    }
 }