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

Minor, simplify code in parseCommandLineArguments

Browse Source
This commit is contained in:
Alexander Udalov
2019-05-20 17:20:43 +02:00
parent effbcdaf70
commit d340f6dc62
1 changed files with 4 additions and 6 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
+4 -6
View File
@@ -136,12 +136,10 @@ private fun <A : CommonToolArguments> parsePreprocessedCommandLineArguments(args
errors.unknownExtraFlags += arg errors.unknownExtraFlags += arg
} else { } else {
val newInternalArgument = parser.parseInternalArgument(arg, errors) ?: continue val newInternalArgument = parser.parseInternalArgument(arg, errors) ?: continue
val argumentWillBeOverridden = when (newInternalArgument) { // Manual language feature setting overrides the previous value of the same feature setting, if it exists.
is ManualLanguageFeatureSetting -> internalArguments.firstOrNull { (it is ManualLanguageFeatureSetting) && (it.languageFeature == newInternalArgument.languageFeature) } internalArguments.removeIf {
else -> null (it as? ManualLanguageFeatureSetting)?.languageFeature ==
} (newInternalArgument as? ManualLanguageFeatureSetting)?.languageFeature
if (argumentWillBeOverridden != null) {
internalArguments.remove(argumentWillBeOverridden)
} }
internalArguments.add(newInternalArgument) internalArguments.add(newInternalArgument)
} }