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

Minor. Clarified "compiled file" as "file to compile".

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-09-24 16:29:49 +04:00
parent 060796997e
commit cb58d19e29
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt
+7 -7
View File
@@ -23,17 +23,17 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName
import java.util.HashMap import java.util.HashMap
import java.io.File import java.io.File
public fun IncrementalCache.getPackagesWithRemovedFiles(compiledSourceFiles: Collection<JetFile>): Collection<FqName> { public fun IncrementalCache.getPackagesWithRemovedFiles(sourceFilesToCompile: Collection<JetFile>): Collection<FqName> {
return getRemovedPackageParts(compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() } return getRemovedPackageParts(sourceFilesToCompile).map { it.getFqNameForClassNameWithoutDollars().parent() }
} }
public fun IncrementalCache.getRemovedPackageParts(compiledSourceFiles: Collection<JetFile>): Collection<JvmClassName> { public fun IncrementalCache.getRemovedPackageParts(sourceFilesToCompile: Collection<JetFile>): Collection<JvmClassName> {
val compiledSourceFilesToFqName = HashMap<File, String>() val sourceFilesToFqName = HashMap<File, String>()
for (sourceFile in compiledSourceFiles) { for (sourceFile in sourceFilesToCompile) {
compiledSourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName().asString() 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? { public fun IncrementalCache.getPackageData(fqName: FqName): ByteArray? {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ import java.util.HashMap
import java.io.File import java.io.File
public trait IncrementalCache { public trait IncrementalCache {
public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String>): Collection<String> public fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String>): Collection<String>
public fun getPackageData(fqName: String): ByteArray? public fun getPackageData(fqName: String): ByteArray?
jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+2 -2
View File
@@ -106,8 +106,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
} }
} }
public override fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String>): Collection<String> { public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String>): Collection<String> {
return packagePartMap.getRemovedPackageParts(compiledSourceFilesToFqName) return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames)
} }
public override fun getPackageData(fqName: String): ByteArray? { public override fun getPackageData(fqName: String): ByteArray? {