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

Writing class names in proto map (to avoid ambiguities)

Browse Source 
Original commit: 5c49eb0a54
This commit is contained in:
Evgeny Gerashchenko
2014-06-20 21:32:15 +04:00
parent 703972b020
commit ed03bec629
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+10 -10
View File
@@ -37,6 +37,7 @@ import java.util.HashSet
import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache
import java.util.HashMap import java.util.HashMap
import com.google.common.collect.Maps import com.google.common.collect.Maps
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
class object { class object {
@@ -55,16 +56,15 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
if (classNameAndHeader == null) return false if (classNameAndHeader == null) return false
val (className, header) = classNameAndHeader val (className, header) = classNameAndHeader
val classFqName = className.getFqNameForClassNameWithoutDollars()
val annotationDataEncoded = header.annotationData val annotationDataEncoded = header.annotationData
if (annotationDataEncoded != null) { if (annotationDataEncoded != null) {
val data = BitEncoding.decodeBytes(annotationDataEncoded) val data = BitEncoding.decodeBytes(annotationDataEncoded)
when (header.kind) { when (header.kind) {
KotlinClassHeader.Kind.PACKAGE_FACADE -> { KotlinClassHeader.Kind.PACKAGE_FACADE -> {
return protoMap.put(moduleId, classFqName.parent(), data) return protoMap.put(moduleId, className, data)
} }
KotlinClassHeader.Kind.CLASS -> { KotlinClassHeader.Kind.CLASS -> {
return protoMap.put(moduleId, classFqName, data) return protoMap.put(moduleId, className, data)
} }
else -> { else -> {
throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}")
@@ -90,7 +90,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
} }
public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { public override fun getPackageData(moduleId: String, fqName: String): ByteArray? {
return protoMap[moduleId, fqName] return protoMap[moduleId, JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))]
} }
public fun close() { public fun close() {
@@ -106,12 +106,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
ByteArrayExternalizer ByteArrayExternalizer
) )
private fun getKeyString(moduleId: String, fqName: FqName): String { private fun getKeyString(moduleId: String, className: JvmClassName): String {
return moduleId + ":" + fqName return moduleId + ":" + className.getInternalName()
} }
public fun put(moduleId: String, fqName: FqName, data: ByteArray): Boolean { public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean {
val key = getKeyString(moduleId, fqName) val key = getKeyString(moduleId, className)
val oldData = map[key] val oldData = map[key]
if (Arrays.equals(data, oldData)) { if (Arrays.equals(data, oldData)) {
return false return false
@@ -120,8 +120,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
return true return true
} }
public fun get(moduleId: String, fqName: String): ByteArray? { public fun get(moduleId: String, className: JvmClassName): ByteArray? {
return map[getKeyString(moduleId, FqName(fqName))] return map[getKeyString(moduleId, className)]
} }
public fun close() { public fun close() {