diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 000c183656f..64b06dd97d3 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -32,7 +32,7 @@ class FSOperationsHelper( fun hasMarkedDirty(): Boolean = markedDirty - fun markChunk(recursively: Boolean = false, kotlinOnly: Boolean = true, excludeFiles: Set = setOf()) { + fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set = setOf()) { fun shouldMark(file: File): Boolean { if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b167b4818fb..401e6aa598f 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -226,7 +226,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR saveVersions(context, chunk) if (targets.any { hasKotlin[it] == null }) { - fsOperations.markChunk(excludeFiles = filesToCompile.values().toSet()) + fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = filesToCompile.values().toSet()) } for (target in targets) { @@ -276,7 +276,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR when { inlineAdded -> { allCompiledFiles.clear() - fsOperations.markChunk(recursively = true, excludeFiles = compiledFiles) + fsOperations.markChunk(recursively = true, kotlinOnly = true, excludeFiles = compiledFiles) return } constantsChanged -> { @@ -284,7 +284,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return } protoChanged -> { - fsOperations.markChunk(excludeFiles = allCompiledFiles) + fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = allCompiledFiles) } } @@ -365,7 +365,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR rebuildAfterCacheVersionChanged[target] = true } - fsOperations.markChunk() + fsOperations.markChunk(recursively = false, kotlinOnly = true) return }