From dcb2d7b4f6d617359ec19242cef8094b2baee20d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 10 May 2016 22:11:31 +0300 Subject: [PATCH] Minor, break the line in "kotlinc -help" if it's too long To improve description of the "pluginOptions" flag --- .../cli/common/arguments/CommonCompilerArguments.java | 2 +- .../cli/src/org/jetbrains/kotlin/cli/common/Usage.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java index 2a08546962c..6abe0d4f53b 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java @@ -52,7 +52,7 @@ public abstract class CommonCompilerArguments { @ValueDescription("") public String[] pluginClasspaths; - @Argument(value = "P", description = "\n Pass an option to a plugin") + @Argument(value = "P", description = "Pass an option to a plugin") @ValueDescription(PLUGIN_OPTION_FORMAT) public String[] pluginOptions; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java index 48f008e10a5..0f5f31593a0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java @@ -72,9 +72,16 @@ class Usage { sb.append(" "); sb.append(description.value()); } - while (sb.length() < OPTION_NAME_PADDING_WIDTH - 1) { + + int width = OPTION_NAME_PADDING_WIDTH - 1; + if (sb.length() >= width + 5) { // Break the line if it's too long + sb.append("\n"); + width += sb.length(); + } + while (sb.length() < width) { sb.append(" "); } + sb.append(" "); sb.append(argument.description()); return sb.toString();