azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kapt: abort compilation on error in annotation processing stage (KT-13622)

Browse Source 
(cherry picked from commit f78b8b4)
This commit is contained in:
Yan Zhulanow
2016-08-29 17:47:12 +03:00
committed by Yan Zhulanow
parent cc7eaeb910
commit 941d016cef
7 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+1 -1
View File
@@ -137,7 +137,7 @@ public enum TopDownAnalyzerFacadeForJVM {
AnalysisCompletedHandlerExtension.Companion.getInstances(moduleContext.getProject());
for (AnalysisCompletedHandlerExtension extension : analysisCompletedHandlerExtensions) {
AnalysisResult result = extension.analysisCompleted(project, module, bindingContext, files);
AnalysisResult result = extension.analysisCompleted(project, module, trace, files);
if (result != null) return result;
}
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt
+2 -3
View File
@@ -18,11 +18,10 @@ 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
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTrace
interface AnalysisCompletedHandlerExtension {
companion object : ProjectExtensionDescriptor<AnalysisCompletedHandlerExtension>(
@@ -33,6 +32,6 @@ interface AnalysisCompletedHandlerExtension {
fun analysisCompleted(
project: Project,
module: ModuleDescriptor,
bindingContext: BindingContext,
bindingTrace: BindingTrace,
files: Collection<KtFile>): AnalysisResult?
}