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

Minor, fix several CLI argument descriptions

Browse Source
This commit is contained in:
Alexander Udalov
2018-06-27 13:25:00 +02:00
parent a765ee41d7
commit 0c45f20515
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+1 -1
View File
@@ -144,7 +144,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
@Argument( @Argument(
value = "-Xuse-experimental", value = "-Xuse-experimental",
valueDescription = "<fq.name>", valueDescription = "<fq.name>",
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<String>? by FreezableVar(null) var useExperimental: Array<String>? by FreezableVar(null)
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+1 -1
View File
@@ -231,7 +231,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
"-Xjvm-default=enable Allow usages of @JvmDefault; only generate the default method\n" + "-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" + " in the interface (annotating an existing method can break binary compatibility)\n" +
"-Xjvm-default=compatibility Allow usages of @JvmDefault; generate a compatibility accessor\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) var jvmDefault: String by FreezableVar(JvmDefaultMode.DEFAULT.description)
compiler/testData/cli/js/jsExtraHelp.out
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ where advanced options include:
-Xreport-output-files Report source to output files mapping -Xreport-output-files Report source to output files mapping
-Xreport-perf Report detailed performance statistics -Xreport-perf Report detailed performance statistics
-Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes) -Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes)
-Xuse-experimental=<fq.name> Enable usages of COMPILATION-affecting experimental API for marker annotation with the given fully qualified name -Xuse-experimental=<fq.name> 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. Advanced options are non-standard and may be changed or removed without any notice.
OK OK
compiler/testData/cli/jvm/extraHelp.out
Vendored
+1 -2
View File
@@ -37,7 +37,6 @@ where advanced options include:
in the interface (annotating an existing method can break binary compatibility) in the interface (annotating an existing method can break binary compatibility)
-Xjvm-default=compatibility Allow usages of @JvmDefault; generate a compatibility accessor -Xjvm-default=compatibility Allow usages of @JvmDefault; generate a compatibility accessor
in the 'DefaultImpls' class in addition to the interface method in the 'DefaultImpls' class in addition to the interface method
-Xload-builtins-from-dependencies -Xload-builtins-from-dependencies
Load definitions of built-in declarations from module dependencies, instead of from the compiler 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 -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-output-files Report source to output files mapping
-Xreport-perf Report detailed performance statistics -Xreport-perf Report detailed performance statistics
-Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes) -Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes)
-Xuse-experimental=<fq.name> Enable usages of COMPILATION-affecting experimental API for marker annotation with the given fully qualified name -Xuse-experimental=<fq.name> 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. Advanced options are non-standard and may be changed or removed without any notice.
OK OK