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

Minor, add nameResolver to ProtoContainer

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-30 19:53:24 +03:00
parent 14ec34e37c
commit 3a7a48a079
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+2 -2
View File
@@ -241,8 +241,8 @@ public class MemberDeserializer(private val c: DeserializationContext) {
}
private fun DeclarationDescriptor.asProtoContainer(): ProtoContainer? = when(this) {
is PackageFragmentDescriptor -> ProtoContainer(null, fqName)
is DeserializedClassDescriptor -> ProtoContainer(classProto, null)
is PackageFragmentDescriptor -> ProtoContainer(null, fqName, c.nameResolver)
is DeserializedClassDescriptor -> ProtoContainer(classProto, null, c.nameResolver)
else -> null // TODO: support annotations on lambdas and their parameters
}
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
+5 -1
View File
@@ -19,7 +19,11 @@ package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.ProtoBuf
public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {
public data class ProtoContainer(
val classProto: ProtoBuf.Class?,
val packageFqName: FqName?,
val nameResolver: NameResolver
) {
init {
assert((classProto != null) xor (packageFqName != null))
}