kapt: Stop compiler gracefully

compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java

@@ -152,9 +152,6 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
                 Disposer.dispose(rootDisposable);
             }
         }
-        catch (CompilationInterruptedException e) {
-            return e.exitCode;
-        }
         catch (Throwable t) {
             groupingCollector.report(CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(t),
                                      CompilerMessageLocation.NO_LOCATION);
@@ -204,12 +201,4 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
             return INTERNAL_ERROR;
         }
     }
-
-    public static class CompilationInterruptedException extends RuntimeException {
-        final ExitCode exitCode;
-
-        public CompilationInterruptedException(ExitCode exitCode) {
-            this.exitCode = exitCode;
-        }
-    }
 }

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -287,6 +287,8 @@ public class KotlinToJVMBytecodeCompiler {
             return null;
         }
 
+        if (!result.getShouldGenerateCode()) return null;
+
         result.throwIfError();
 
         return generate(environment, result, environment.getSourceFiles(), null, null);

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java

@@ -155,7 +155,8 @@ public enum TopDownAnalyzerFacadeForJVM {
                     AnalysisCompletedHandlerExtension.Companion.getInstances(moduleContext.getProject());
 
             for (AnalysisCompletedHandlerExtension extension : analysisCompletedHandlerExtensions) {
-                extension.analysisCompleted(project, module, bindingContext, files);
+                AnalysisResult result = extension.analysisCompleted(project, module, bindingContext, files);
+                if (result != null) return result;
             }
 
             return AnalysisResult.success(bindingContext, module);

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.resolve.jvm.extensions
 
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
@@ -33,5 +34,5 @@ public interface AnalysisCompletedHandlerExtension {
             project: Project,
             module: ModuleDescriptor,
             bindingContext: BindingContext,
-            files: Collection<JetFile>)
+            files: Collection<JetFile>): AnalysisResult?
 }

compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt

@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.ErrorUtils
 import kotlin.platform.platformStatic
 
-public data open class AnalysisResult protected (
+public data open class AnalysisResult protected constructor(
         public val bindingContext: BindingContext,
-        public val moduleDescriptor: ModuleDescriptor
+        public val moduleDescriptor: ModuleDescriptor,
+        public val shouldGenerateCode: Boolean = true
 ) {
 
     public val error: Throwable
@@ -43,7 +44,11 @@ public data open class AnalysisResult protected (
         public val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())
 
         platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalysisResult {
-            return AnalysisResult(bindingContext, module)
+            return AnalysisResult(bindingContext, module, true)
+        }
+
+        platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor, shouldGenerateCode: Boolean): AnalysisResult {
+            return AnalysisResult(bindingContext, module, shouldGenerateCode)
         }
 
         platformStatic public fun error(bindingContext: BindingContext, error: Throwable): AnalysisResult {

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

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.annotation
 
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo
@@ -34,7 +35,12 @@ import java.io.File
 
 public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompletedHandlerExtension {
 
-    override fun analysisCompleted(project: Project, module: ModuleDescriptor, bindingContext: BindingContext, files: Collection<JetFile>) {
+    override fun analysisCompleted(
+            project: Project,
+            module: ModuleDescriptor,
+            bindingContext: BindingContext,
+            files: Collection<JetFile>
+    ): AnalysisResult? {
         val forExtraDiagnostics = BindingTraceContext()
         
         val generationState = GenerationState(
@@ -60,7 +66,7 @@ public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompleted
         generationState.getFactory().writeAllTo(stubsOutputDir)
 
         generationState.destroy()
-        throw CLICompiler.CompilationInterruptedException(ExitCode.OK)
+        return AnalysisResult.success(BindingContext.EMPTY, module, shouldGenerateCode = false)
     }
 }