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

Minor: move check inside hasDirtyOrRemovedKotlin

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-11-27 20:58:05 +03:00
parent 60a8db1c6c
commit 3d3d670cd7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+5 -7
View File
@@ -171,9 +171,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
return CHUNK_REBUILD_REQUIRED return CHUNK_REBUILD_REQUIRED
} }
if ((dirtyFilesHolder.hasDirtyFiles() || dirtyFilesHolder.hasRemovedFiles()) && if (hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) {
hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)
) {
targets.forEach { setHasKotlin(it, dataManager.dataPaths) } targets.forEach { setHasKotlin(it, dataManager.dataPaths) }
} }
else { else {
@@ -828,11 +826,11 @@ private fun hasKotlinDirtyOrRemovedFiles(
dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>, dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>,
chunk: ModuleChunk chunk: ModuleChunk
): Boolean { ): Boolean {
if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty()) { if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) return false
return true
}
return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty) return true
return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() }
} }
public open class GeneratedFile internal constructor( public open class GeneratedFile internal constructor(