From 68870a16bb5bc6ff5296dd3087c123ffa805770c Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 23 Oct 2017 16:11:07 +0300 Subject: [PATCH] Remove CLI help on 'preserve-class-initialization' mode See https://youtrack.jetbrains.com/issue/KT-19532#comment=27-2492178 --- .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt | 7 ++----- compiler/testData/cli/jvm/extraHelp.out | 4 ++-- 2 files changed, 4 insertions(+), 7 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 6ccd752ebd5..a222d3dc1dd 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 @@ -111,11 +111,8 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { @Argument( value = "-Xnormalize-constructor-calls", - valueDescription = "{disable|enable|preserve-class-initialization}", - description = "Normalize constructor calls " + - "(disable: don't normalize; enable: normalize; " + - "preserve-class-initialization: normalize preserving class initialization order), " + - "default is disable" + valueDescription = "{disable|enable}", + description = "Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable" ) var constructorCallNormalizationMode: String? by FreezableVar(JVMConstructorCallNormalizationMode.DEFAULT.description) diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 5266ca72e19..63ecaa010a3 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -5,8 +5,8 @@ where advanced options include: or all modules on the module path if is ALL-MODULE-PATH -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|preserve-class-initialization} - Normalize constructor calls (disable: don't normalize; enable: normalize; preserve-class-initialization: normalize preserving class initialization order), default is disable + -Xnormalize-constructor-calls={disable|enable} + Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable -Xdump-declarations-to= Path to JSON file to dump Java to Kotlin declaration mappings -Xmultifile-parts-inherit Compile multifile classes as a hierarchy of parts and facade -Xmodule-path= Paths where to find Java 9+ modules