jps, mpp: fix marking expect/actual complementary files as dirty

This files should be marked as dirty for current round, not next
This commit is contained in:
Sergey Rostov
2018-05-30 12:35:55 +03:00
parent 65bdfa72c1
commit b2fedd7b1e
3 changed files with 7 additions and 3 deletions
@@ -60,6 +60,10 @@ class FSOperationsHelper(
markFilesImpl(files, beforeRound = true) { it.exists() && moduleBasedFilter.accept(it) }
}
fun markComplementaryFiles(files: Iterable<File>) {
markFilesImpl(files, beforeRound = true) { it.exists() }
}
fun markFiles(files: Iterable<File>) {
markFilesImpl(files, beforeRound = false) { it.exists() }
}
@@ -538,7 +538,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
removedAndDirtyFiles.addAll(roundDirtyFilesHolder.getRemovedFilesSet(target))
val complementaryFiles = cache.clearComplementaryFilesMapping(targetDirtyFiles.dirtyOrRemovedFiles)
targetDirtyFiles.markDirty(complementaryFiles)
targetDirtyFiles.addComplementaryFiles(complementaryFiles)
cache.markDirty(targetDirtyFiles.dirtyOrRemovedFiles)
}
@@ -51,8 +51,8 @@ class KotlinRoundDirtySourceFilesHolder(
return result
}
fun markDirty(files: Collection<File>) {
fsOperations.markFiles(files)
fun addComplementaryFiles(files: Collection<File>) {
fsOperations.markComplementaryFiles(files)
files.forEach {
dirty.add(DirtyFile(it, null))
}