Skip to content

Commit 0e91c56

Browse files
VampireVampire
authored
fix(abg): Use "a.to(b)" instead of "a to b" (#1607)
Or Kotlin Poet sometimes breaks before the "to" which is illegal.
1 parent f9ac222 commit 0e91c56

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎action-binding-generator/src/main/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/generation/Generation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ private fun Metadata.linkedMapOfInputs(inputTypings: Map<String, Typing>): CodeB
307307
inputs.forEach { (key, value) ->
308308
val asStringCode = inputTypings.getInputTyping(key).asString()
309309
if (!value.shouldBeNonNullInBinding()) {
310-
add("%N?.let { %S to it$asStringCode },\n", key.toCamelCase(), key)
310+
add("%N?.let { %S.to(it$asStringCode) },\n", key.toCamelCase(), key)
311311
} else {
312-
add("%S to %N$asStringCode,\n", key, key.toCamelCase())
312+
add("%S.to(%N$asStringCode),\n", key, key.toCamelCase())
313313
}
314314
}
315315
add("*$CUSTOM_INPUTS.%M().%M(),\n", Types.mapToList, Types.listToArray)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithAllTypesOfInputs.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,19 @@ public data class ActionWithAllTypesOfInputs private constructor(
130130
@Suppress("SpreadOperator")
131131
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
132132
*listOfNotNull(
133-
"foo-bar" to fooBar,
134-
"baz-goo" to bazGoo.toString(),
135-
binKin?.let { "bin-kin" to it.toString() },
136-
"int-pint" to intPint.toString(),
137-
"flo-pint" to floPint.toString(),
138-
"fin-bin" to finBin.stringValue,
139-
"goo-zen" to gooZen.integerValue.toString(),
140-
"bah-enum" to bahEnum.stringValue,
141-
listStrings?.let { "list-strings" to it.joinToString(",") },
142-
listInts?.let { "list-ints" to it.joinToString(",") { it.toString() } },
143-
listEnums?.let { "list-enums" to it.joinToString(",") { it.stringValue } },
144-
listIntSpecial?.let { "list-int-special" to it.joinToString(",") {
145-
it.integerValue.toString() } },
133+
"foo-bar".to(fooBar),
134+
"baz-goo".to(bazGoo.toString()),
135+
binKin?.let { "bin-kin".to(it.toString()) },
136+
"int-pint".to(intPint.toString()),
137+
"flo-pint".to(floPint.toString()),
138+
"fin-bin".to(finBin.stringValue),
139+
"goo-zen".to(gooZen.integerValue.toString()),
140+
"bah-enum".to(bahEnum.stringValue),
141+
listStrings?.let { "list-strings".to(it.joinToString(",")) },
142+
listInts?.let { "list-ints".to(it.joinToString(",") { it.toString() }) },
143+
listEnums?.let { "list-enums".to(it.joinToString(",") { it.stringValue }) },
144+
listIntSpecial?.let { "list-int-special".to(it.joinToString(",") {
145+
it.integerValue.toString() }) },
146146
*_customInputs.toList().toTypedArray(),
147147
).toTypedArray()
148148
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithDeprecatedInputAndNameClash.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public data class ActionWithDeprecatedInputAndNameClash private constructor(
5757
@Suppress("SpreadOperator")
5858
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
5959
*listOfNotNull(
60-
"fooBar" to fooBar,
60+
"fooBar".to(fooBar),
6161
*_customInputs.toList().toTypedArray(),
6262
).toTypedArray()
6363
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithFancyCharsInDocs.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public data class ActionWithFancyCharsInDocs private constructor(
6464
@Suppress("SpreadOperator")
6565
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
6666
*listOfNotNull(
67-
nestedKotlinComments?.let { "nested-kotlin-comments" to it },
68-
percent?.let { "percent" to it },
67+
nestedKotlinComments?.let { "nested-kotlin-comments".to(it) },
68+
percent?.let { "percent".to(it) },
6969
*_customInputs.toList().toTypedArray(),
7070
).toTypedArray()
7171
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithInputsSharingType.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public data class ActionWithInputsSharingType private constructor(
5959
@Suppress("SpreadOperator")
6060
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
6161
*listOfNotNull(
62-
"foo-one" to fooOne.integerValue.toString(),
63-
"foo-two" to fooTwo.integerValue.toString(),
64-
fooThree?.let { "foo-three" to it.integerValue.toString() },
62+
"foo-one".to(fooOne.integerValue.toString()),
63+
"foo-two".to(fooTwo.integerValue.toString()),
64+
fooThree?.let { "foo-three".to(it.integerValue.toString()) },
6565
*_customInputs.toList().toTypedArray(),
6666
).toTypedArray()
6767
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithNoTypings_Untyped.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public data class ActionWithNoTypings_Untyped private constructor(
7474
@Suppress("SpreadOperator")
7575
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
7676
*listOfNotNull(
77-
"foo" to foo,
78-
bar?.let { "bar" to it },
77+
"foo".to(foo),
78+
bar?.let { "bar".to(it) },
7979
*_customInputs.toList().toTypedArray(),
8080
).toTypedArray()
8181
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithOutputs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public data class ActionWithOutputs private constructor(
5757
@Suppress("SpreadOperator")
5858
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
5959
*listOfNotNull(
60-
"foo-bar" to fooBar,
60+
"foo-bar".to(fooBar),
6161
*_customInputs.toList().toTypedArray(),
6262
).toTypedArray()
6363
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/ActionWithSomeOptionalInputs.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ public data class ActionWithSomeOptionalInputs private constructor(
8282
@Suppress("SpreadOperator")
8383
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
8484
*listOfNotNull(
85-
fooBar?.let { "foo-bar" to it },
86-
bazGoo?.let { "baz-goo" to it },
87-
zooDar?.let { "zoo-dar" to it },
88-
cooPoo?.let { "coo-poo" to it },
89-
"package" to `package`,
85+
fooBar?.let { "foo-bar".to(it) },
86+
bazGoo?.let { "baz-goo".to(it) },
87+
zooDar?.let { "zoo-dar".to(it) },
88+
cooPoo?.let { "coo-poo".to(it) },
89+
"package".to(`package`),
9090
*_customInputs.toList().toTypedArray(),
9191
).toTypedArray()
9292
)

‎action-binding-generator/src/test/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/bindingsfromunittests/SimpleActionWithRequiredStringInputs.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public data class SimpleActionWithRequiredStringInputs private constructor(
7070
@Suppress("SpreadOperator")
7171
override fun toYamlArguments(): LinkedHashMap<String, String> = linkedMapOf(
7272
*listOfNotNull(
73-
"foo-bar" to fooBar,
74-
"baz-goo" to bazGoo,
73+
"foo-bar".to(fooBar),
74+
"baz-goo".to(bazGoo),
7575
*_customInputs.toList().toTypedArray(),
7676
).toTypedArray()
7777
)

0 commit comments

Comments
 (0)