Make NameResolver.getClassId extension instead of member

To get rid of dependency of NameResolver on ClassId

build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 
 class ChangesCollector {
     private val removedMembers = hashMapOf<FqName, MutableSet<String>>()

build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.deserialization.supertypes
 import java.io.File
 

build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import java.io.DataInput

build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt

@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.util.PerformanceCounter
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.kotlin.utils.sure

build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt

@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.utils.Interner
 import java.util.*
 

compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.utils.Printer
 import java.lang.reflect.Constructor

compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import java.util.*
 

core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt

@@ -19,8 +19,6 @@ package org.jetbrains.kotlin.load.kotlin
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import java.util.*
@@ -85,15 +83,11 @@ class JvmNameResolver(
 
     override fun getName(index: Int) = Name.guessByFirstCharacter(getString(index))
 
-    override fun getClassId(index: Int): ClassId {
+    override fun getQualifiedClassName(index: Int): String =
-        val string = getString(index)
+        getString(index)
-        val lastSlash = string.lastIndexOf('/')
+
-        val packageName =
+    override fun isLocalClassName(index: Int): Boolean =
-                if (lastSlash < 0) FqName.ROOT
+        index in localNameIndices
-                else FqName(string.substring(0, lastSlash).replace('/', '.'))
-        val className = FqName(string.substring(lastSlash + 1))
-        return ClassId(packageName, className, index in localNameIndices)
-    }
 
     companion object {
         val PREDEFINED_STRINGS = listOf(

core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import java.io.ByteArrayInputStream
 import java.io.DataInputStream
 import java.io.IOException

core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java

@@ -100,9 +100,14 @@ public final class ClassId {
      */
     @NotNull
     public static ClassId fromString(@NotNull String string) {
+        return fromString(string, false);
+    }
+
+    @NotNull
+    public static ClassId fromString(@NotNull String string, boolean isLocal) {
         String packageName = StringsKt.substringBeforeLast(string, '/', "").replace('/', '.');
         String className = StringsKt.substringAfterLast(string, '/', string);
-        return new ClassId(new FqName(packageName), new FqName(className), false);
+        return new ClassId(new FqName(packageName), new FqName(className), isLocal);
     }
 
     /**

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java

@@ -27,6 +27,11 @@ public interface NameResolver {
     @NotNull
     Name getName(int index);
 
+    /**
+     * @return the fully qualified name of some class in the format: `org/foo/bar/Test.Inner`
+     */
     @NotNull
-    ClassId getClassId(int index);
+    String getQualifiedClassName(int index);
+
+    boolean isLocalClassName(int index);
 }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt

@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import java.util.*
@@ -32,11 +31,16 @@ class NameResolverImpl(
 
     override fun getName(index: Int) = Name.guessByFirstCharacter(strings.getString(index))
 
-    override fun getClassId(index: Int): ClassId {
+    override fun getQualifiedClassName(index: Int): String {
-        val (packageFqNameSegments, relativeClassNameSegments, isLocal) = traverseIds(index)
+        val (packageFqNameSegments, relativeClassNameSegments) = traverseIds(index)
-        return ClassId(FqName.fromSegments(packageFqNameSegments), FqName.fromSegments(relativeClassNameSegments), isLocal)
+        val className = relativeClassNameSegments.joinToString(".")
+        return if (packageFqNameSegments.isEmpty()) className
+        else packageFqNameSegments.joinToString("/") + "/$className"
     }
 
+    override fun isLocalClassName(index: Int): Boolean =
+        traverseIds(index).third
+
     fun getPackageFqName(index: Int): FqName {
         val packageNameSegments = traverseIds(index).first
         return FqName.fromSegments(packageNameSegments)

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.serialization.deserialization
+
+import org.jetbrains.kotlin.name.ClassId
+
+fun NameResolver.getClassId(index: Int): ClassId {
+    return ClassId.fromString(getQualifiedClassName(index), isLocalClassName(index))
+}

generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt

@@ -87,6 +87,7 @@ class GenerateProtoBufCompare {
         p.println("import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf")
         p.println("import org.jetbrains.kotlin.name.ClassId")
         p.println("import org.jetbrains.kotlin.serialization.deserialization.NameResolver")
+        p.println("import org.jetbrains.kotlin.serialization.deserialization.getClassId")
         p.println("import org.jetbrains.kotlin.utils.Interner")
         p.println("import java.util.*")
         p.println()

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import java.io.ByteArrayInputStream
 
 class KotlinBuiltInDecompiler : KotlinMetadataDecompiler<BuiltInsBinaryVersion>(

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt

@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt

@@ -21,10 +21,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
+import org.jetbrains.kotlin.serialization.deserialization.*
-import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.types.KotlinType
 
 class AnnotationLoaderForStubBuilderImpl(

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt

@@ -31,10 +31,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
+import org.jetbrains.kotlin.serialization.deserialization.*
-import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
 import org.jetbrains.kotlin.utils.addIfNotNull
 import java.io.IOException
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt

@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 
 open class KotlinMetadataStubBuilder(
         private val version: Int,

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt

@@ -37,10 +37,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.*
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.TypeTable
-import org.jetbrains.kotlin.serialization.deserialization.supertypes
 
 fun createClassStub(
         parent: StubElement<out PsiElement>,

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeAliasStubImpl
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 
 fun createTypeAliasStub(
         parent: StubElement<out PsiElement>,

idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.utils.JsMetadataVersion
 import java.io.ByteArrayInputStream
 import java.io.DataInput

jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt

@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import org.junit.Assert