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

Make NameResolver.getName extension instead of member

Browse Source 
To get rid of dependency of NameResolver on Name
This commit is contained in:
Alexander Udalov
2018-03-01 13:27:53 +01:00
parent e31f286444
commit 4f81e572c7
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt
+1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.serialization.deserialization.getName
import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.getValue
core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt
-3
View File
@@ -19,7 +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.Name
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import java.util.*
@@ -81,8 +80,6 @@ class JvmNameResolver(
return string
}
override fun getName(index: Int) = Name.guessByFirstCharacter(getString(index))
override fun getQualifiedClassName(index: Int): String =
getString(index)