From 0c45f2051546784d95d19bea610ca710d7b9c51f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 27 Jun 2018 13:25:00 +0200 Subject: [PATCH] Minor, fix several CLI argument descriptions --- .../kotlin/cli/common/arguments/CommonCompilerArguments.kt | 2 +- .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt | 2 +- compiler/testData/cli/js/jsExtraHelp.out | 2 +- compiler/testData/cli/jvm/extraHelp.out | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt index b7b214afc25..2b773b3b0c4 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt @@ -144,7 +144,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() { @Argument( value = "-Xuse-experimental", valueDescription = "", - description = "Enable usages of COMPILATION-affecting experimental API for marker annotation with the given fully qualified name" + description = "Enable, but don't propagate usages of experimental API for marker annotation with the given fully qualified name" ) var useExperimental: Array? by FreezableVar(null) 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 80818324301..b1cf1540cd4 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 @@ -231,7 +231,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { "-Xjvm-default=enable Allow usages of @JvmDefault; only generate the default method\n" + " in the interface (annotating an existing method can break binary compatibility)\n" + "-Xjvm-default=compatibility Allow usages of @JvmDefault; generate a compatibility accessor\n" + - " in the 'DefaultImpls' class in addition to the interface method\n" + " in the 'DefaultImpls' class in addition to the interface method" ) var jvmDefault: String by FreezableVar(JvmDefaultMode.DEFAULT.description) diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index 0ec84caafa5..cdf4063ad5f 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -26,7 +26,7 @@ where advanced options include: -Xreport-output-files Report source to output files mapping -Xreport-perf Report detailed performance statistics -Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes) - -Xuse-experimental= Enable usages of COMPILATION-affecting experimental API for marker annotation with the given fully qualified name + -Xuse-experimental= Enable, but don't propagate usages of experimental API for marker annotation with the given fully qualified name Advanced options are non-standard and may be changed or removed without any notice. OK diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 94be734f148..906b7a54ed7 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -37,7 +37,6 @@ where advanced options include: in the interface (annotating an existing method can break binary compatibility) -Xjvm-default=compatibility Allow usages of @JvmDefault; generate a compatibility accessor in the 'DefaultImpls' class in addition to the interface method - -Xload-builtins-from-dependencies Load definitions of built-in declarations from module dependencies, instead of from the compiler -Xno-call-assertions Don't generate not-null assertions for arguments of platform types @@ -81,7 +80,7 @@ where advanced options include: -Xreport-output-files Report source to output files mapping -Xreport-perf Report detailed performance statistics -Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes) - -Xuse-experimental= Enable usages of COMPILATION-affecting experimental API for marker annotation with the given fully qualified name + -Xuse-experimental= Enable, but don't propagate usages of experimental API for marker annotation with the given fully qualified name Advanced options are non-standard and may be changed or removed without any notice. OK