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

[CLI] Get rid of unnecessary type parameters in arguments.kt

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2023-04-21 13:21:28 +00:00
committed by Space Team
parent 13ce25a85c
commit 1f649b698c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt
+5 -5
View File
@@ -20,8 +20,8 @@ import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
fun <A : CommonCompilerArguments> CompilerConfiguration.setupCommonArguments( fun CompilerConfiguration.setupCommonArguments(
arguments: A, arguments: CommonCompilerArguments,
createMetadataVersion: ((IntArray) -> BinaryVersion)? = null createMetadataVersion: ((IntArray) -> BinaryVersion)? = null
) { ) {
val messageCollector = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) val messageCollector = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
@@ -79,7 +79,7 @@ fun switchToFallbackModeIfNecessary(arguments: CommonCompilerArguments, messageC
} }
} }
fun <A : CommonCompilerArguments> CompilerConfiguration.setupLanguageVersionSettings(arguments: A) { fun CompilerConfiguration.setupLanguageVersionSettings(arguments: CommonCompilerArguments) {
languageVersionSettings = arguments.toLanguageVersionSettings(getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)) languageVersionSettings = arguments.toLanguageVersionSettings(getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY))
} }
@@ -105,7 +105,7 @@ fun computeKotlinPaths(messageCollector: MessageCollector, arguments: CommonComp
} }
} }
fun <A : CommonToolArguments> MessageCollector.reportArgumentParseProblems(arguments: A) { fun MessageCollector.reportArgumentParseProblems(arguments: CommonToolArguments) {
val errors = arguments.errors ?: return val errors = arguments.errors ?: return
for (flag in errors.unknownExtraFlags) { for (flag in errors.unknownExtraFlags) {
report(CompilerMessageSeverity.STRONG_WARNING, "Flag is not supported by this version of the compiler: $flag") report(CompilerMessageSeverity.STRONG_WARNING, "Flag is not supported by this version of the compiler: $flag")
@@ -133,7 +133,7 @@ fun <A : CommonToolArguments> MessageCollector.reportArgumentParseProblems(argum
} }
} }
private fun <A : CommonToolArguments> MessageCollector.reportUnsafeInternalArgumentsIfAny(arguments: A) { private fun MessageCollector.reportUnsafeInternalArgumentsIfAny(arguments: CommonToolArguments) {
val unsafeArguments = arguments.internalArguments.filterNot { val unsafeArguments = arguments.internalArguments.filterNot {
// -XXLanguage which turns on BUG_FIX considered safe // -XXLanguage which turns on BUG_FIX considered safe
it is ManualLanguageFeatureSetting && it.languageFeature.kind == LanguageFeature.Kind.BUG_FIX && it.state == LanguageFeature.State.ENABLED it is ManualLanguageFeatureSetting && it.languageFeature.kind == LanguageFeature.Kind.BUG_FIX && it.state == LanguageFeature.State.ENABLED