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

Simplified interface of IncrementalCache (depending on JDK only).

Browse Source 
Original commit: 04f7ad450f
This commit is contained in:
Evgeny Gerashchenko
2014-06-06 19:43:31 +04:00
parent 18c00c7b5e
commit 06a2d64247
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+8 -17
View File
@@ -168,31 +168,22 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache {
putPackagePartSourceData(moduleId, sourceFile, null) putPackagePartSourceData(moduleId, sourceFile, null)
} }
public override fun getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<FqName> { public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String> {
return getRemovedPackageParts(moduleId, compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() } val result = HashSet<String>()
}
public override fun getRemovedPackageParts(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<JvmClassName> {
val sourceFileToCurrentFqNameMap = HashMap<File, FqName>()
for (sourceFile in compiledSourceFiles) {
sourceFileToCurrentFqNameMap[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName()
}
val result = HashSet<JvmClassName>()
packageSourcesData.processKeysWithExistingMapping { key -> packageSourcesData.processKeysWithExistingMapping { key ->
if (key!!.startsWith(moduleId + File.pathSeparator)) { if (key!!.startsWith(moduleId + File.pathSeparator)) {
val indexOf = key.indexOf(File.pathSeparator) val indexOf = key.indexOf(File.pathSeparator)
val sourceFile = File(key.substring(indexOf + 1)) val sourceFile = File(key.substring(indexOf + 1))
val packagePartClassName = JvmClassName.byInternalName(packageSourcesData[key]!!) val packagePartClassName = packageSourcesData[key]!!
if (!sourceFile.exists()) { if (!sourceFile.exists()) {
result.add(packagePartClassName) result.add(packagePartClassName)
} }
else { else {
val previousPackageFqName = packagePartClassName.getFqNameForClassNameWithoutDollars().parent() val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent()
val currentPackageFqName = sourceFileToCurrentFqNameMap[sourceFile] val currentPackageFqName = compiledSourceFilesToFqName[sourceFile]
if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName) { if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) {
result.add(packagePartClassName) result.add(packagePartClassName)
} }
} }
@@ -204,8 +195,8 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache {
return result return result
} }
public override fun getPackageData(moduleId: String, fqName: FqName): ByteArray? { public override fun getPackageData(moduleId: String, fqName: String): ByteArray? {
return protoData[ClassOrPackageId(moduleId, fqName)] return protoData[ClassOrPackageId(moduleId, FqName(fqName))]
} }
public fun close() { public fun close() {