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

Fix calling toString() on ProtoContainer

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-27 18:03:27 +03:00
parent f0a9c4f683
commit bd575c39dd
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
+9
View File
@@ -18,9 +18,18 @@ package org.jetbrains.jet.descriptors.serialization.descriptors
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.jet.descriptors.serialization.NameResolver
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {
{
assert(classProto != null || packageFqName != null)
assert(classProto == null || packageFqName == null)
}
fun getFqName(nameResolver: NameResolver): FqNameUnsafe {
if (packageFqName != null) return packageFqName.toUnsafe()
return nameResolver.getClassId(classProto!!.getFqName()).asSingleFqName()
}
}