Skip to content

Commit ea9a2e6

Browse files
ilya-gSpace Team
authored and
Space Team
committed
[KLIB] prettify format of default parameters
(cherry picked from commit 6972ed6)
1 parent 50654fe commit ea9a2e6

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

compiler/testData/klib/dump-abi/content/classifiers.v1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class classifiers.test/DataClass { // classifiers.test/DataClass|null[0]
3030
final fun <get-property>(): kotlin/String // classifiers.test/DataClass.property.<get-property>|4838831487146901942[0]
3131
constructor <init>(kotlin/String) // classifiers.test/DataClass.<init>|1280618353163213788[0]
3232
final fun component1(): kotlin/String // classifiers.test/DataClass.component1|162597135895221648[0]
33-
final fun copy(kotlin/String =...): classifiers.test/DataClass // classifiers.test/DataClass.copy|-8298725480798151031[0]
33+
final fun copy(kotlin/String = ...): classifiers.test/DataClass // classifiers.test/DataClass.copy|-8298725480798151031[0]
3434
final fun equals(kotlin/Any?): kotlin/Boolean // classifiers.test/DataClass.equals|4638265728071529943[0]
3535
final fun function(): kotlin/String // classifiers.test/DataClass.function|-3322893411126713785[0]
3636
final fun hashCode(): kotlin/Int // classifiers.test/DataClass.hashCode|3409210261493131192[0]

compiler/testData/klib/dump-abi/content/classifiers.v2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class classifiers.test/DataClass { // classifiers.test/DataClass|null[0]
3030
final fun <get-property>(): kotlin/String // classifiers.test/DataClass.property.<get-property>|<get-property>(){}[0]
3131
constructor <init>(kotlin/String) // classifiers.test/DataClass.<init>|<init>(kotlin.String){}[0]
3232
final fun component1(): kotlin/String // classifiers.test/DataClass.component1|component1(){}[0]
33-
final fun copy(kotlin/String =...): classifiers.test/DataClass // classifiers.test/DataClass.copy|copy(kotlin.String){}[0]
33+
final fun copy(kotlin/String = ...): classifiers.test/DataClass // classifiers.test/DataClass.copy|copy(kotlin.String){}[0]
3434
final fun equals(kotlin/Any?): kotlin/Boolean // classifiers.test/DataClass.equals|equals(kotlin.Any?){}[0]
3535
final fun function(): kotlin/String // classifiers.test/DataClass.function|function(){}[0]
3636
final fun hashCode(): kotlin/Int // classifiers.test/DataClass.hashCode|hashCode(){}[0]

compiler/testData/klib/dump-abi/content/value_parameters.v1.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
// - Show declarations: true
55

66
// Library unique name: <value_parameters_library>
7-
final fun value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|-2013334893880470152[0]
8-
final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|-1283395221811731897[0]
7+
final fun value_parameters.test/funWithDefaultArgs(kotlin/Int = ..., kotlin/Long, kotlin/String = ...): kotlin/String // value_parameters.test/funWithDefaultArgs|-2013334893880470152[0]
8+
final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int = ..., kotlin/Long, kotlin/String = ...): kotlin/String // value_parameters.test/funWithDefaultArgs|-1283395221811731897[0]
99
final inline fun value_parameters.test/funWithInlineParameters1(kotlin/Function1<kotlin/Int, kotlin/String>, noinline kotlin/Function1<kotlin/Int, kotlin/String>, crossinline kotlin/Function1<kotlin/Int, kotlin/String>): kotlin/String // value_parameters.test/funWithInlineParameters1|8789385144825475619[0]
1010
final inline fun value_parameters.test/funWithInlineParameters2(kotlin/Function1<kotlin/Int, kotlin/String>, noinline kotlin/Function1<kotlin/Int, kotlin/String>, crossinline kotlin/Function1<kotlin/Int, kotlin/String>): kotlin/String // value_parameters.test/funWithInlineParameters2|-8517782923091139351[0]
11-
final inline fun value_parameters.test/funWithMixedStuff(crossinline kotlin/Function1<kotlin/Int, kotlin/String> =...): kotlin/String // value_parameters.test/funWithMixedStuff|6465248722251168090[0]
11+
final inline fun value_parameters.test/funWithMixedStuff(crossinline kotlin/Function1<kotlin/Int, kotlin/String> = ...): kotlin/String // value_parameters.test/funWithMixedStuff|6465248722251168090[0]
1212
final fun value_parameters.test/funWithVararg(kotlin/Array<out kotlin/Any?>...): kotlin/String // value_parameters.test/funWithVararg|-6768739871601372622[0]
13-
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/Array<out kotlin/Any?>... =...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|8916237708127614843[0]
14-
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/LongArray... =...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|7273069930119485025[0]
13+
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/Array<out kotlin/Any?>... = ...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|8916237708127614843[0]
14+
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/LongArray... = ...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|7273069930119485025[0]

compiler/testData/klib/dump-abi/content/value_parameters.v2.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
// - Show declarations: true
55

66
// Library unique name: <value_parameters_library>
7-
final fun value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs(kotlin.Int;kotlin.Long;kotlin.String){}[0]
8-
final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs!kotlin.Int!kotlin.Long(kotlin.Int;kotlin.Long;kotlin.String){}[0]
7+
final fun value_parameters.test/funWithDefaultArgs(kotlin/Int = ..., kotlin/Long, kotlin/String = ...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs(kotlin.Int;kotlin.Long;kotlin.String){}[0]
8+
final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int = ..., kotlin/Long, kotlin/String = ...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs!kotlin.Int!kotlin.Long(kotlin.Int;kotlin.Long;kotlin.String){}[0]
99
final inline fun value_parameters.test/funWithInlineParameters1(kotlin/Function1<kotlin/Int, kotlin/String>, noinline kotlin/Function1<kotlin/Int, kotlin/String>, crossinline kotlin/Function1<kotlin/Int, kotlin/String>): kotlin/String // value_parameters.test/funWithInlineParameters1|funWithInlineParameters1(kotlin.Function1<kotlin.Int,kotlin.String>;kotlin.Function1<kotlin.Int,kotlin.String>;kotlin.Function1<kotlin.Int,kotlin.String>){}[0]
1010
final inline fun value_parameters.test/funWithInlineParameters2(kotlin/Function1<kotlin/Int, kotlin/String>, noinline kotlin/Function1<kotlin/Int, kotlin/String>, crossinline kotlin/Function1<kotlin/Int, kotlin/String>): kotlin/String // value_parameters.test/funWithInlineParameters2|funWithInlineParameters2(kotlin.Function1<kotlin.Int,kotlin.String>;kotlin.Function1<kotlin.Int,kotlin.String>;kotlin.Function1<kotlin.Int,kotlin.String>){}[0]
11-
final inline fun value_parameters.test/funWithMixedStuff(crossinline kotlin/Function1<kotlin/Int, kotlin/String> =...): kotlin/String // value_parameters.test/funWithMixedStuff|funWithMixedStuff(kotlin.Function1<kotlin.Int,kotlin.String>){}[0]
11+
final inline fun value_parameters.test/funWithMixedStuff(crossinline kotlin/Function1<kotlin/Int, kotlin/String> = ...): kotlin/String // value_parameters.test/funWithMixedStuff|funWithMixedStuff(kotlin.Function1<kotlin.Int,kotlin.String>){}[0]
1212
final fun value_parameters.test/funWithVararg(kotlin/Array<out kotlin/Any?>...): kotlin/String // value_parameters.test/funWithVararg|funWithVararg(kotlin.Array<out|kotlin.Any?>...){}[0]
13-
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/Array<out kotlin/Any?>... =...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|funWithVarargAndDefaultArg(kotlin.Array<out|kotlin.Any?>...){}[0]
14-
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/LongArray... =...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|funWithVarargAndDefaultArg(kotlin.LongArray...){}[0]
13+
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/Array<out kotlin/Any?>... = ...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|funWithVarargAndDefaultArg(kotlin.Array<out|kotlin.Any?>...){}[0]
14+
final fun value_parameters.test/funWithVarargAndDefaultArg(kotlin/LongArray... = ...): kotlin/String // value_parameters.test/funWithVarargAndDefaultArg|funWithVarargAndDefaultArg(kotlin.LongArray...){}[0]

compiler/util-klib-abi/src/org/jetbrains/kotlin/library/abi/impl/LibraryAbiRendererImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ internal class AbiRendererImpl(
424424
if (valueParameter.isCrossinline) append("crossinline ")
425425
appendType(valueParameter.type)
426426
if (valueParameter.isVararg) append("...")
427-
if (valueParameter.hasDefaultArg) append(" =...")
427+
if (valueParameter.hasDefaultArg) append(" = ...")
428428
return ""
429429
}
430430

0 commit comments

Comments
 (0)