Minor: reformat CommonCompilerArguments

This commit is contained in:
Dmitry Savvinov
2018-03-27 12:36:39 +03:00
parent e8181c0473
commit 9876ecd6df
@@ -25,7 +25,8 @@ import java.util.*
@SuppressWarnings("WeakerAccess") @SuppressWarnings("WeakerAccess")
abstract class CommonCompilerArguments : CommonToolArguments() { abstract class CommonCompilerArguments : CommonToolArguments() {
companion object { companion object {
@JvmStatic private val serialVersionUID = 0L @JvmStatic
private val serialVersionUID = 0L
const val PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>" const val PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>"
@@ -39,9 +40,9 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
@GradleOption(DefaultValues.LanguageVersions::class) @GradleOption(DefaultValues.LanguageVersions::class)
@Argument( @Argument(
value = "-language-version", value = "-language-version",
valueDescription = "<version>", valueDescription = "<version>",
description = "Provide source compatibility with specified language version" description = "Provide source compatibility with specified language version"
) )
var languageVersion: String? by FreezableVar(null) var languageVersion: String? by FreezableVar(null)
@@ -50,16 +51,16 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
@GradleOption(DefaultValues.LanguageVersions::class) @GradleOption(DefaultValues.LanguageVersions::class)
@Argument( @Argument(
value = "-api-version", value = "-api-version",
valueDescription = "<version>", valueDescription = "<version>",
description = "Allow to use declarations only from the specified version of bundled libraries" description = "Allow to use declarations only from the specified version of bundled libraries"
) )
var apiVersion: String? by FreezableVar(null) var apiVersion: String? by FreezableVar(null)
@Argument( @Argument(
value = "-kotlin-home", value = "-kotlin-home",
valueDescription = "<path>", valueDescription = "<path>",
description = "Path to Kotlin compiler home directory, used for runtime libraries discovery" description = "Path to Kotlin compiler home directory, used for runtime libraries discovery"
) )
var kotlinHome: String? by FreezableVar(null) var kotlinHome: String? by FreezableVar(null)
@@ -72,12 +73,15 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
var noInline: Boolean by FreezableVar(false) var noInline: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xskip-metadata-version-check", value = "-Xskip-metadata-version-check",
description = "Load classes with bad metadata version anyway (incl. pre-release classes)" description = "Load classes with bad metadata version anyway (incl. pre-release classes)"
) )
var skipMetadataVersionCheck: Boolean by FreezableVar(false) var skipMetadataVersionCheck: Boolean by FreezableVar(false)
@Argument(value = "-Xallow-kotlin-package", description = "Allow compiling code in package 'kotlin' and allow not requiring kotlin.stdlib in module-info") @Argument(
value = "-Xallow-kotlin-package",
description = "Allow compiling code in package 'kotlin' and allow not requiring kotlin.stdlib in module-info"
)
var allowKotlinPackage: Boolean by FreezableVar(false) var allowKotlinPackage: Boolean by FreezableVar(false)
@Argument(value = "-Xreport-output-files", description = "Report source to output files mapping") @Argument(value = "-Xreport-output-files", description = "Report source to output files mapping")
@@ -93,34 +97,34 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
var noCheckActual: Boolean by FreezableVar(false) var noCheckActual: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xintellij-plugin-root", value = "-Xintellij-plugin-root",
valueDescription = "<path>", valueDescription = "<path>",
description = "Path to the kotlin-compiler.jar or directory where IntelliJ configuration files can be found" description = "Path to the kotlin-compiler.jar or directory where IntelliJ configuration files can be found"
) )
var intellijPluginRoot: String? by FreezableVar(null) var intellijPluginRoot: String? by FreezableVar(null)
@Argument( @Argument(
value = "-Xcoroutines", value = "-Xcoroutines",
valueDescription = "{enable|warn|error}", valueDescription = "{enable|warn|error}",
description = "Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier" description = "Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier"
) )
var coroutinesState: String? by FreezableVar(WARN) var coroutinesState: String? by FreezableVar(WARN)
@Argument( @Argument(
value = "-Xnew-inference", value = "-Xnew-inference",
description = "Enable new experimental generic type inference algorithm" description = "Enable new experimental generic type inference algorithm"
) )
var newInference: Boolean by FreezableVar(false) var newInference: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xlegacy-smart-cast-after-try", value = "-Xlegacy-smart-cast-after-try",
description = "Allow var smart casts despite assignment in try block" description = "Allow var smart casts despite assignment in try block"
) )
var legacySmartCastAfterTry: Boolean by FreezableVar(false) var legacySmartCastAfterTry: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xeffect-system", value = "-Xeffect-system",
description = "Enable experimental language feature: effect system" description = "Enable experimental language feature: effect system"
) )
var effectSystem: Boolean by FreezableVar(false) var effectSystem: Boolean by FreezableVar(false)
@@ -131,9 +135,9 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
var readDeserializedContracts: Boolean by FreezableVar(false) var readDeserializedContracts: Boolean by FreezableVar(false)
@Argument( @Argument(
value = "-Xexperimental", value = "-Xexperimental",
valueDescription = "<fq.name>", valueDescription = "<fq.name>",
description = "Enable and propagate usages of experimental API for marker annotation with the given fully qualified name" description = "Enable and propagate usages of experimental API for marker annotation with the given fully qualified name"
) )
var experimental: Array<String>? by FreezableVar(null) var experimental: Array<String>? by FreezableVar(null)
@@ -190,7 +194,8 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
when (coroutinesState) { when (coroutinesState) {
CommonCompilerArguments.ERROR -> put(LanguageFeature.Coroutines, LanguageFeature.State.ENABLED_WITH_ERROR) CommonCompilerArguments.ERROR -> put(LanguageFeature.Coroutines, LanguageFeature.State.ENABLED_WITH_ERROR)
CommonCompilerArguments.ENABLE -> put(LanguageFeature.Coroutines, LanguageFeature.State.ENABLED) CommonCompilerArguments.ENABLE -> put(LanguageFeature.Coroutines, LanguageFeature.State.ENABLED)
CommonCompilerArguments.WARN -> {} CommonCompilerArguments.WARN -> {
}
else -> { else -> {
val message = "Invalid value of -Xcoroutines (should be: enable, warn or error): " + coroutinesState val message = "Invalid value of -Xcoroutines (should be: enable, warn or error): " + coroutinesState
collector.report(CompilerMessageSeverity.ERROR, message, null) collector.report(CompilerMessageSeverity.ERROR, message, null)