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

Remove dependency of NameResolverImpl on FqName

Browse Source 
Remove AbstractJsProtoComparisonTest.getProtoData in favor of
(apparently copy-pasted) IncrementalJsCache.getProtoData
This commit is contained in:
Alexander Udalov
2018-03-02 18:15:47 +01:00
parent 4f81e572c7
commit b07c6086cd
5 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt
+2 -5
View File
@@ -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.FqName
import java.util.*
class NameResolverImpl(
@@ -37,10 +36,8 @@ class NameResolverImpl(
override fun isLocalClassName(index: Int): Boolean =
traverseIds(index).third
fun getPackageFqName(index: Int): FqName {
val packageNameSegments = traverseIds(index).first
return FqName.fromSegments(packageNameSegments)
}
fun getPackageFqName(index: Int): String =
traverseIds(index).first.joinToString(".")
private fun traverseIds(startingIndex: Int): Triple<List<String>, List<String>, Boolean> {
var index = startingIndex