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

[klib] Don't print val/var for all constructor parameters

Browse Source
This commit is contained in:
Ilya Matveev
2018-02-09 15:43:18 +07:00
committed by ilmat192
parent 3d84f862b6
commit fa21659c80
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/PrettyPrinter.kt
+3 -6
View File
@@ -174,7 +174,7 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
val visibility = if (!isEnumClass) Flags.VISIBILITY.get(flags).asString() else ""
// TODO: '\n' was used here as a separator (see annotationsToString code). Return it?
val annotations = annotationsToString(getExtension(KonanSerializerProtocol.constructorAnnotation))
val parameters = valueParameterList.joinToString(", ", prefix = "(", postfix = ")") { it.asString(true) }
val parameters = valueParameterList.joinToString(", ", prefix = "(", postfix = ")") { it.asString() }
val header = "$visibility$annotations"
if (isPrimary) {
@@ -262,17 +262,14 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
//-------------------------------------------------------------------------//
private fun ProtoBuf.ValueParameter.asString(isConstructor: Boolean = false): String {
private fun ProtoBuf.ValueParameter.asString(): String {
val parameterName = stringTable.getString(name)
val type = TypeTables.type(typeId).asString()
val isVar = if (isConstructor) Flags.IS_VAR.asString(flags) else ""
val isCrossInline = Flags.IS_CROSSINLINE.asString(flags)
val visibility0 = Flags.VISIBILITY.get(flags).asString()
val visibility = if (visibility0 == "internal ") "" else visibility0
val annotations = annotationsToString(getExtension(KonanSerializerProtocol.parameterAnnotation))
return "$annotations$isCrossInline$visibility$isVar$parameterName: $type"
return "$annotations$isCrossInline$parameterName: $type"
}
//-------------------------------------------------------------------------//