Make NameResolver.getClassId extension instead of member

To get rid of dependency of NameResolver on ClassId

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 {
-        val string = getString(index)
-        val lastSlash = string.lastIndexOf('/')
-        val packageName =
-                if (lastSlash < 0) FqName.ROOT
-                else FqName(string.substring(0, lastSlash).replace('/', '.'))
-        val className = FqName(string.substring(lastSlash + 1))
-        return ClassId(packageName, className, index in localNameIndices)
-    }
+    override fun getQualifiedClassName(index: Int): String =
+        getString(index)
+
+    override fun isLocalClassName(index: Int): Boolean =
+        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