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

[CLI] Arguments: Implement raw vs resolved delimiters

Browse Source 
KTIJ-24976
This commit is contained in:
Sebastian Sellmair
2023-03-31 10:23:52 +02:00
committed by Space Team
parent d07b1b6502
commit 7f91e94e7a
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/compilerRunner/argumentsToStrings.kt
+5 -4
View File
@@ -10,6 +10,7 @@ package org.jetbrains.kotlin.compilerRunner
import org.jetbrains.kotlin.cli.common.arguments.Argument
import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
import org.jetbrains.kotlin.cli.common.arguments.isAdvanced
import org.jetbrains.kotlin.cli.common.arguments.resolvedDelimiter
import kotlin.reflect.KClass
import kotlin.reflect.full.findAnnotation
import kotlin.reflect.full.memberProperties
@@ -31,8 +32,8 @@ internal fun <T : CommonToolArguments> toArgumentStrings(thisArguments: T, type:
val rawPropertyValue = property.get(thisArguments)
val rawDefaultValue = property.get(defaultArguments)
/* Default value can be omitted when not marked as 'isExplicit' */
if (rawPropertyValue == rawDefaultValue && !argumentAnnotation.isExplicit) {
/* Default value can be omitted */
if (rawPropertyValue == rawDefaultValue) {
return@forEach
}
@@ -78,8 +79,8 @@ internal fun <T : CommonToolArguments> toArgumentStrings(thisArguments: T, type:
private fun getArgumentStringValue(argumentAnnotation: Argument, values: Array<*>?): List<String> {
if (values.isNullOrEmpty()) return emptyList()
val delimiter = argumentAnnotation.delimiter
return if (delimiter.isEmpty()) values.map { it.toString() }
val delimiter = argumentAnnotation.resolvedDelimiter
return if (delimiter.isNullOrEmpty()) values.map { it.toString() }
else listOf(values.joinToString(delimiter))
}