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

Minor: remove default values for markChunk parameters

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-12-09 21:54:46 +03:00
parent 6a74b1c8bf
commit ef4b3c99f4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class FSOperationsHelper(
fun hasMarkedDirty(): Boolean = markedDirty fun hasMarkedDirty(): Boolean = markedDirty
fun markChunk(recursively: Boolean = false, kotlinOnly: Boolean = true, excludeFiles: Set<File> = setOf()) { fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set<File> = setOf()) {
fun shouldMark(file: File): Boolean { fun shouldMark(file: File): Boolean {
if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+4 -4
View File
@@ -226,7 +226,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
saveVersions(context, chunk) saveVersions(context, chunk)
if (targets.any { hasKotlin[it] == null }) { 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) { for (target in targets) {
@@ -276,7 +276,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
when { when {
inlineAdded -> { inlineAdded -> {
allCompiledFiles.clear() allCompiledFiles.clear()
fsOperations.markChunk(recursively = true, excludeFiles = compiledFiles) fsOperations.markChunk(recursively = true, kotlinOnly = true, excludeFiles = compiledFiles)
return return
} }
constantsChanged -> { constantsChanged -> {
@@ -284,7 +284,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
return return
} }
protoChanged -> { 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 rebuildAfterCacheVersionChanged[target] = true
} }
fsOperations.markChunk() fsOperations.markChunk(recursively = false, kotlinOnly = true)
return return
} }