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

[klib] Fix printing classes without a primary constructor

Browse Source
This commit is contained in:
Ilya Matveev
2018-02-09 16:28:24 +07:00
committed by ilmat192
parent fa21659c80
commit f4cb918a1c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/PrettyPrinter.kt
+2 -2
View File
@@ -124,7 +124,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
val typeParameters = typeParameterList val typeParameters = typeParameterList
.joinToString("<", "> ") { it.asString() } .joinToString("<", "> ") { it.asString() }
.let { if (it.isEmpty()) " " else it } .let { if (it.isEmpty()) " " else it }
val primaryConstructor = primaryConstructor().asString(isEnumClass, true) val primaryConstructor = primaryConstructor()?.asString(isEnumClass, true) ?: ""
val supertypes = supertypesToString(supertypeIdList) val supertypes = supertypesToString(supertypeIdList)
val annotations = annotationsToString(getExtension(KonanSerializerProtocol.classAnnotation), "\n") val annotations = annotationsToString(getExtension(KonanSerializerProtocol.classAnnotation), "\n")
@@ -353,7 +353,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
private fun getParentName(id: Int) = qualifiedNameTable.getQualifiedName(id).parentQualifiedName private fun getParentName(id: Int) = qualifiedNameTable.getQualifiedName(id).parentQualifiedName
private fun ProtoBuf.Class.primaryConstructor() = constructorList.first { !Flags.IS_SECONDARY.get(it.flags) } private fun ProtoBuf.Class.primaryConstructor() = constructorList.firstOrNull { !Flags.IS_SECONDARY.get(it.flags) }
private fun ProtoBuf.Class.secondaryConstructors() = constructorList.filter { Flags.IS_SECONDARY.get(it.flags) } private fun ProtoBuf.Class.secondaryConstructors() = constructorList.filter { Flags.IS_SECONDARY.get(it.flags) }
private val ProtoBuf.Class.isEnumClass: Boolean private val ProtoBuf.Class.isEnumClass: Boolean