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

Minor, add DescriptorUtils.isClassOrEnumClass

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-23 02:12:32 +03:00
parent 48a0a95e8f
commit e67318e049
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+1 -2
View File
@@ -247,8 +247,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
is PackageFragmentDescriptor -> ProtoContainer.Package(fqName, c.nameResolver, c.typeTable, c.packagePartSource)
is DeserializedClassDescriptor -> ProtoContainer.Class(
classProto, c.nameResolver, c.typeTable,
isCompanionOfClass = DescriptorUtils.isCompanionObject(this) &&
containingDeclaration.let { DescriptorUtils.isClass(it) || DescriptorUtils.isEnumClass(it) },
isCompanionOfClass = DescriptorUtils.isCompanionObject(this) && DescriptorUtils.isClassOrEnumClass(containingDeclaration),
isInterface = kind == ClassKind.INTERFACE
)
else -> null // TODO: support annotations on lambdas and their parameters