From 729da29e49d8537902385d816f3628f25b37574a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 28 Sep 2018 15:36:15 +0300 Subject: [PATCH] Update command-line options help for '-Xnormalize-constructor-calls' Default value depends on language version. --- .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt | 4 +++- compiler/testData/cli/jvm/extraHelp.out | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index 62a5bf73cd4..e5f66b8138d 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -110,7 +110,9 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { @Argument( value = "-Xnormalize-constructor-calls", valueDescription = "{disable|enable}", - description = "Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable" + description = "Normalize constructor calls (disable: don't normalize; enable: normalize),\n" + + "default is 'disable' in language version 1.2 and below,\n" + + "'enable' since language version 1.3" ) var constructorCallNormalizationMode: String? by NullableStringFreezableVar(null) diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 280ddd9f508..0ab2579802e 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -13,7 +13,9 @@ where advanced options include: -Xbuild-file= Path to the .xml build file to compile -Xcompile-java Reuse javac analysis and compile Java source files -Xnormalize-constructor-calls={disable|enable} - Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable + Normalize constructor calls (disable: don't normalize; enable: normalize), + default is 'disable' in language version 1.2 and below, + 'enable' since language version 1.3 -Xdump-declarations-to= Path to JSON file to dump Java to Kotlin declaration mappings -Xdisable-default-scripting-plugin Do not enable scripting plugin by default