Fix serialization of arrays in compiler arguments
#KT-54791 Fixed
This commit is contained in:
committed by
teamcity
parent
21991a70e0
commit
fbb0d6d805
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.build
|
package org.jetbrains.kotlin.build
|
||||||
|
|
||||||
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
|
|
||||||
import org.jetbrains.kotlin.cli.common.arguments.collectProperties
|
import org.jetbrains.kotlin.cli.common.arguments.collectProperties
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
import kotlin.reflect.full.memberProperties
|
import kotlin.reflect.full.memberProperties
|
||||||
@@ -77,7 +76,15 @@ fun <T : Any> transformClassToPropertiesMap(classToTransform: T, excludedPropert
|
|||||||
.filter { property -> property.name !in excludedProperties }
|
.filter { property -> property.name !in excludedProperties }
|
||||||
.associateBy(
|
.associateBy(
|
||||||
keySelector = { property -> property.name },
|
keySelector = { property -> property.name },
|
||||||
valueTransform = { property -> property.get(classToTransform).toString() })
|
valueTransform = { property ->
|
||||||
|
property.get(classToTransform).let { value ->
|
||||||
|
if (value is Array<*>) {
|
||||||
|
(property.get(classToTransform) as Array<*>).joinToString(",")
|
||||||
|
} else {
|
||||||
|
property.get(classToTransform).toString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
fun List<String>.joinToReadableString(): String = when {
|
fun List<String>.joinToReadableString(): String = when {
|
||||||
size > 5 -> take(5).joinToString() + " and ${size - 5} more"
|
size > 5 -> take(5).joinToString() + " and ${size - 5} more"
|
||||||
|
|||||||
Reference in New Issue
Block a user