Beautify kotlinc -help output

compiler/testData/cli/js/jsHelp.out

@@ -1,16 +1,17 @@
-Usage: org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments
-  -output [String] Output file path
-  -libraryFiles [String[,]] Path to zipped lib sources or kotlin files
-  -sourceFiles [String[,]] Source files (dir or file)
-  -sourcemap [flag] Generate SourceMap
-  -target [String] Generate JS files for specific ECMA version (only ECMA 5 is supported)
-  -main [String] Whether a main function should be called; either 'call' or 'noCall', default 'call' (main function will be auto detected)
-  -outputPrefix [String] Path to file which will be added to the beginning of output file
-  -outputPostfix [String] Path to file which will be added to the end of output file
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-js <options> <source files>
+where possible options include:
+  -output <path>             Output file path
+  -libraryFiles <path[,]>    Path to zipped library sources or kotlin files separated by commas
+  -sourceFiles <path[,]>     Source files or directories separated by commas
+  -sourcemap                 Generate SourceMap
+  -target <version>          Generate JS files for specific ECMA version (only ECMA 5 is supported)
+  -main {call,noCall}        Whether a main function should be called; default 'call' (main function will be auto detected)
+  -outputPrefix <path>       Path to file which will be added to the beginning of output file
+  -outputPostfix <path>      Path to file which will be added to the end of output file
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 OK

compiler/testData/cli/jvm/help.out

@@ -1,23 +1,24 @@
-Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-  -src [String] Source file or directory (allows many paths separated by the system path separator)
-  -jar [String] Resulting .jar file path
-  -output [String] Output directory path for .class files
-  -classpath [String] Paths where to find user class files
-  -annotations [String] Paths to external annotations
-  -includeRuntime [flag] Include Kotlin runtime in to resulting .jar
-  -noJdk [flag] Don't include Java runtime into classpath
-  -noStdlib [flag] Don't include Kotlin runtime into classpath
-  -noJdkAnnotations [flag] Don't include JDK external annotations into classpath
-  -notNullAssertions [flag] Generate not-null assertion after each invocation of method returning not-null
-  -notNullParamAssertions [flag] Generate not-null assertions on parameters of methods accessible from Java
-  -module [String] Path to the module file to compile
-  -script [flag] Evaluate the script file
-  -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -inline [String] Inlining mode: on/off (default is on)
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-jvm <options> <source files>
+where possible options include:
+  -src <path>                Source file or directory (allows many paths separated by the system path separator)
+  -jar <path>                Resulting .jar file path
+  -output <path>             Output directory path for .class files
+  -classpath <path>          Paths where to find user class files
+  -annotations <path>        Paths to external annotations
+  -includeRuntime            Include Kotlin runtime in to resulting .jar
+  -noJdk                     Don't include Java runtime into classpath
+  -noStdlib                  Don't include Kotlin runtime into classpath
+  -noJdkAnnotations          Don't include JDK external annotations into classpath
+  -notNullAssertions         Generate not-null assertion after each invocation of method returning not-null
+  -notNullParamAssertions    Generate not-null assertions on parameters of methods accessible from Java
+  -module <path>             Path to the module file to compile
+  -script                    Evaluate the script file
+  -kotlinHome <path>         Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
+  -inline {on,off}           Inlining mode (default is on)
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 OK

compiler/testData/cli/jvm/inline/off.out

@@ -1,23 +1,24 @@
-Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-  -src [String] Source file or directory (allows many paths separated by the system path separator)
-  -jar [String] Resulting .jar file path
-  -output [String] Output directory path for .class files
-  -classpath [String] Paths where to find user class files
-  -annotations [String] Paths to external annotations
-  -includeRuntime [flag] Include Kotlin runtime in to resulting .jar
-  -noJdk [flag] Don't include Java runtime into classpath
-  -noStdlib [flag] Don't include Kotlin runtime into classpath
-  -noJdkAnnotations [flag] Don't include JDK external annotations into classpath
-  -notNullAssertions [flag] Generate not-null assertion after each invocation of method returning not-null
-  -notNullParamAssertions [flag] Generate not-null assertions on parameters of methods accessible from Java
-  -module [String] Path to the module file to compile
-  -script [flag] Evaluate the script file
-  -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -inline [String] Inlining mode: on/off (default is on)
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-jvm <options> <source files>
+where possible options include:
+  -src <path>                Source file or directory (allows many paths separated by the system path separator)
+  -jar <path>                Resulting .jar file path
+  -output <path>             Output directory path for .class files
+  -classpath <path>          Paths where to find user class files
+  -annotations <path>        Paths to external annotations
+  -includeRuntime            Include Kotlin runtime in to resulting .jar
+  -noJdk                     Don't include Java runtime into classpath
+  -noStdlib                  Don't include Kotlin runtime into classpath
+  -noJdkAnnotations          Don't include JDK external annotations into classpath
+  -notNullAssertions         Generate not-null assertion after each invocation of method returning not-null
+  -notNullParamAssertions    Generate not-null assertions on parameters of methods accessible from Java
+  -module <path>             Path to the module file to compile
+  -script                    Evaluate the script file
+  -kotlinHome <path>         Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
+  -inline {on,off}           Inlining mode (default is on)
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 OK

compiler/testData/cli/jvm/inline/on.out

@@ -1,23 +1,24 @@
-Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-  -src [String] Source file or directory (allows many paths separated by the system path separator)
-  -jar [String] Resulting .jar file path
-  -output [String] Output directory path for .class files
-  -classpath [String] Paths where to find user class files
-  -annotations [String] Paths to external annotations
-  -includeRuntime [flag] Include Kotlin runtime in to resulting .jar
-  -noJdk [flag] Don't include Java runtime into classpath
-  -noStdlib [flag] Don't include Kotlin runtime into classpath
-  -noJdkAnnotations [flag] Don't include JDK external annotations into classpath
-  -notNullAssertions [flag] Generate not-null assertion after each invocation of method returning not-null
-  -notNullParamAssertions [flag] Generate not-null assertions on parameters of methods accessible from Java
-  -module [String] Path to the module file to compile
-  -script [flag] Evaluate the script file
-  -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -inline [String] Inlining mode: on/off (default is on)
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-jvm <options> <source files>
+where possible options include:
+  -src <path>                Source file or directory (allows many paths separated by the system path separator)
+  -jar <path>                Resulting .jar file path
+  -output <path>             Output directory path for .class files
+  -classpath <path>          Paths where to find user class files
+  -annotations <path>        Paths to external annotations
+  -includeRuntime            Include Kotlin runtime in to resulting .jar
+  -noJdk                     Don't include Java runtime into classpath
+  -noStdlib                  Don't include Kotlin runtime into classpath
+  -noJdkAnnotations          Don't include JDK external annotations into classpath
+  -notNullAssertions         Generate not-null assertion after each invocation of method returning not-null
+  -notNullParamAssertions    Generate not-null assertions on parameters of methods accessible from Java
+  -module <path>             Path to the module file to compile
+  -script                    Evaluate the script file
+  -kotlinHome <path>         Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
+  -inline {on,off}           Inlining mode (default is on)
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 OK

compiler/testData/cli/jvm/inline/wrong.out

@@ -1,24 +1,25 @@
 Wrong value for inline option: 'wrong'. Should be 'on'/'off' or 'true'/'false'
-Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-  -src [String] Source file or directory (allows many paths separated by the system path separator)
-  -jar [String] Resulting .jar file path
-  -output [String] Output directory path for .class files
-  -classpath [String] Paths where to find user class files
-  -annotations [String] Paths to external annotations
-  -includeRuntime [flag] Include Kotlin runtime in to resulting .jar
-  -noJdk [flag] Don't include Java runtime into classpath
-  -noStdlib [flag] Don't include Kotlin runtime into classpath
-  -noJdkAnnotations [flag] Don't include JDK external annotations into classpath
-  -notNullAssertions [flag] Generate not-null assertion after each invocation of method returning not-null
-  -notNullParamAssertions [flag] Generate not-null assertions on parameters of methods accessible from Java
-  -module [String] Path to the module file to compile
-  -script [flag] Evaluate the script file
-  -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -inline [String] Inlining mode: on/off (default is on)
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-jvm <options> <source files>
+where possible options include:
+  -src <path>                Source file or directory (allows many paths separated by the system path separator)
+  -jar <path>                Resulting .jar file path
+  -output <path>             Output directory path for .class files
+  -classpath <path>          Paths where to find user class files
+  -annotations <path>        Paths to external annotations
+  -includeRuntime            Include Kotlin runtime in to resulting .jar
+  -noJdk                     Don't include Java runtime into classpath
+  -noStdlib                  Don't include Kotlin runtime into classpath
+  -noJdkAnnotations          Don't include JDK external annotations into classpath
+  -notNullAssertions         Generate not-null assertion after each invocation of method returning not-null
+  -notNullParamAssertions    Generate not-null assertions on parameters of methods accessible from Java
+  -module <path>             Path to the module file to compile
+  -script                    Evaluate the script file
+  -kotlinHome <path>         Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
+  -inline {on,off}           Inlining mode (default is on)
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 INTERNAL_ERROR

compiler/testData/cli/jvm/wrongArgument.out

@@ -1,24 +1,25 @@
 Invalid argument: -wrongArgument
-Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-  -src [String] Source file or directory (allows many paths separated by the system path separator)
-  -jar [String] Resulting .jar file path
-  -output [String] Output directory path for .class files
-  -classpath [String] Paths where to find user class files
-  -annotations [String] Paths to external annotations
-  -includeRuntime [flag] Include Kotlin runtime in to resulting .jar
-  -noJdk [flag] Don't include Java runtime into classpath
-  -noStdlib [flag] Don't include Kotlin runtime into classpath
-  -noJdkAnnotations [flag] Don't include JDK external annotations into classpath
-  -notNullAssertions [flag] Generate not-null assertion after each invocation of method returning not-null
-  -notNullParamAssertions [flag] Generate not-null assertions on parameters of methods accessible from Java
-  -module [String] Path to the module file to compile
-  -script [flag] Evaluate the script file
-  -kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-  -inline [String] Inlining mode: on/off (default is on)
-  -tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-  -verbose [flag] Enable verbose logging output
-  -version [flag] Display compiler version
-  -help (-h) [flag] Print a synopsis of standard options
-  -suppress [String] Suppress compiler messages by severity (warnings)
-  -printArgs [flag] Print command line arguments
+Usage: kotlinc-jvm <options> <source files>
+where possible options include:
+  -src <path>                Source file or directory (allows many paths separated by the system path separator)
+  -jar <path>                Resulting .jar file path
+  -output <path>             Output directory path for .class files
+  -classpath <path>          Paths where to find user class files
+  -annotations <path>        Paths to external annotations
+  -includeRuntime            Include Kotlin runtime in to resulting .jar
+  -noJdk                     Don't include Java runtime into classpath
+  -noStdlib                  Don't include Kotlin runtime into classpath
+  -noJdkAnnotations          Don't include JDK external annotations into classpath
+  -notNullAssertions         Generate not-null assertion after each invocation of method returning not-null
+  -notNullParamAssertions    Generate not-null assertions on parameters of methods accessible from Java
+  -module <path>             Path to the module file to compile
+  -script                    Evaluate the script file
+  -kotlinHome <path>         Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
+  -inline {on,off}           Inlining mode (default is on)
+  -tags                      Demarcate each compilation message (error, warning, etc) with an open and close tag
+  -verbose                   Enable verbose logging output
+  -version                   Display compiler version
+  -help (-h)                 Print a synopsis of standard options
+  -suppress warnings         Suppress all compiler warnings
+  -printArgs                 Print command line arguments
 INTERNAL_ERROR