From cb58d19e29e823a00168610f7cb65b2fe9c4b9ac Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Sep 2014 16:29:49 +0400 Subject: [PATCH] Minor. Clarified "compiled file" as "file to compile". --- .../kotlin/incremental/IncrementalCacheUtil.kt | 14 +++++++------- .../kotlin/incremental/cache/IncrementalCache.kt | 2 +- .../jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt index 0b55c44b479..e17aef26a11 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt @@ -23,17 +23,17 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashMap import java.io.File -public fun IncrementalCache.getPackagesWithRemovedFiles(compiledSourceFiles: Collection): Collection { - return getRemovedPackageParts(compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() } +public fun IncrementalCache.getPackagesWithRemovedFiles(sourceFilesToCompile: Collection): Collection { + return getRemovedPackageParts(sourceFilesToCompile).map { it.getFqNameForClassNameWithoutDollars().parent() } } -public fun IncrementalCache.getRemovedPackageParts(compiledSourceFiles: Collection): Collection { - val compiledSourceFilesToFqName = HashMap() - for (sourceFile in compiledSourceFiles) { - compiledSourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName().asString() +public fun IncrementalCache.getRemovedPackageParts(sourceFilesToCompile: Collection): Collection { + val sourceFilesToFqName = HashMap() + for (sourceFile in sourceFilesToCompile) { + sourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName().asString() } - return getRemovedPackageParts(compiledSourceFilesToFqName).map { JvmClassName.byInternalName(it) } + return getRemovedPackageParts(sourceFilesToFqName).map { JvmClassName.byInternalName(it) } } public fun IncrementalCache.getPackageData(fqName: FqName): ByteArray? { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt index 043197cd703..f04fa6d6a62 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt @@ -23,7 +23,7 @@ import java.util.HashMap import java.io.File public trait IncrementalCache { - public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection + public fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection public fun getPackageData(fqName: String): ByteArray? diff --git a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 6579ab1d9f8..684e1555258 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -106,8 +106,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } } - public override fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { - return packagePartMap.getRemovedPackageParts(compiledSourceFilesToFqName) + public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { + return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames) } public override fun getPackageData(fqName: String): ByteArray? {