From 1e2cb13c0728daaf940920b6aa615aeab21ec9f8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 19 Sep 2015 15:59:45 +0300 Subject: [PATCH] Remove NameResolver#getFqName, replace with getClassId Original commit: 89fe54c95199424faad6b0777d10c5a05fe3b622 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index e067cae4397..07f99c5ca12 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf @@ -33,10 +32,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public val oldClassIdIndexesMap: MutableMap = hashMapOf() public val newClassIdIndexesMap: MutableMap = hashMapOf() - private val fqNames = Interner() private val classIds = Interner() - open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { if (!checkEqualsPackageMember(old, new)) return false @@ -556,7 +553,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { map[index]?.let { return it } - val result = fqNames.intern(nameResolver.getFqName(index)) + val result = classIds.intern(nameResolver.getClassId(index)) map[index] = result return result }