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

Minor: reformat parseCommandLineArguments, apply intentions

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-03-27 13:56:11 +03:00
parent 9876ecd6df
commit 9ba450ffc5
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/parseCommandLineArguments.kt
+12 -11
View File
@@ -24,19 +24,19 @@ import kotlin.reflect.full.memberProperties
@Target(AnnotationTarget.PROPERTY) @Target(AnnotationTarget.PROPERTY)
annotation class Argument( annotation class Argument(
val value: String, val value: String,
val shortName: String = "", val shortName: String = "",
val deprecatedName: String = "", val deprecatedName: String = "",
val delimiter: String = ",", val delimiter: String = ",",
val valueDescription: String = "", val valueDescription: String = "",
val description: String val description: String
) )
val Argument.isAdvanced: Boolean val Argument.isAdvanced: Boolean
get() = value.startsWith(ADVANCED_ARGUMENT_PREFIX) && value.length > ADVANCED_ARGUMENT_PREFIX.length get() = value.startsWith(ADVANCED_ARGUMENT_PREFIX) && value.length > ADVANCED_ARGUMENT_PREFIX.length
private val ADVANCED_ARGUMENT_PREFIX = "-X" private const val ADVANCED_ARGUMENT_PREFIX = "-X"
private val FREE_ARGS_DELIMITER = "--" private const val FREE_ARGS_DELIMITER = "--"
data class ArgumentParseErrors( data class ArgumentParseErrors(
val unknownArgs: MutableList<String> = SmartList<String>(), val unknownArgs: MutableList<String> = SmartList<String>(),
@@ -90,7 +90,7 @@ fun <A : CommonToolArguments> parseCommandLineArguments(args: List<String>, resu
return true return true
} }
if (deprecatedName != null && arg.startsWith(deprecatedName + "=")) { if (deprecatedName != null && arg.startsWith("$deprecatedName=")) {
errors.deprecatedArguments[deprecatedName] = argument.value errors.deprecatedArguments[deprecatedName] = argument.value
return true return true
} }
@@ -145,8 +145,9 @@ fun <A : CommonToolArguments> parseCommandLineArguments(args: List<String>, resu
} }
if ((argumentField.property.returnType.classifier as? KClass<*>)?.java?.isArray == false if ((argumentField.property.returnType.classifier as? KClass<*>)?.java?.isArray == false
&& !visitedArgs.add(argument.value) && value is String && property.get(result) != value) { && !visitedArgs.add(argument.value) && value is String && property.get(result) != value
errors.duplicateArguments.put(argument.value, value) ) {
errors.duplicateArguments[argument.value] = value
} }
updateField(property, result, value, argument.delimiter) updateField(property, result, value, argument.delimiter)