From 6b20ef020809268d6d3d2789f4b46d96caf85201 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Wed, 12 Dec 2018 14:18:15 +0000 Subject: [PATCH] Complete Java usage tracker if analysis extension finishes (KT-27487) In cases when kapt compiler plugin runs in stubs generation mode, Java usage tracker was not completed. This caused issues with the incremental compilation if Java files changed. E.g. if a constant defined in Java source file changed, stubs would not be recompiled because the Java usage tracker would not report changed type. This commit fixes that issue. --- .../kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt index 1515190af3f..41f276b5d13 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt @@ -91,6 +91,7 @@ object TopDownAnalyzerFacadeForJVM { val analysisHandlerExtensions = AnalysisHandlerExtension.getInstances(project) fun invokeExtensionsOnAnalysisComplete(): AnalysisResult? { + container.get().onCompletedAnalysis(module) for (extension in analysisHandlerExtensions) { val result = extension.analysisCompleted(project, module, trace, files) if (result != null) return result @@ -108,7 +109,6 @@ object TopDownAnalyzerFacadeForJVM { } container.get().analyzeDeclarations(TopDownAnalysisMode.TopLevelDeclarations, files) - container.get().onCompletedAnalysis(module) invokeExtensionsOnAnalysisComplete()?.let { return it }