From 209a96d74f0c5c731bb3d80252db7f58e9138d8c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 17:56:48 +0300 Subject: [PATCH] Updating Kotlin incremental caches and Java mappings only for Java modules. Original commit: 6bf0c9f4ae1890532c9ef3c4e7a50bb7af23d1e7 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 783c697a3e8..860211c60d6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -132,9 +132,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] val outputsItemsAndTargets = getOutputItemsAndTargets(chunk, outputItemCollector) - var recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) registerOutputItems(outputConsumer, outputsItemsAndTargets) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) + + val recompilationDecision: IncrementalCacheImpl.RecompilationDecision + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + } + else { + recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) + } if (compilationErrors) { return ABORT