Minor, simplify code in parseCommandLineArguments

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