From 20d856fa775fe22b72b64b29bb7787cf78fb27ec Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 8 Feb 2017 19:46:12 +0300 Subject: [PATCH] Minor, remove blank line in extra help --- .../cli/src/org/jetbrains/kotlin/cli/common/Usage.java | 7 +++---- compiler/testData/cli/js/jsExtraHelp.out | 1 - compiler/testData/cli/jvm/extraHelp.out | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) 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 6aa0f9d8ea2..53da3338202 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java @@ -39,10 +39,8 @@ class Usage { for (Field field : clazz.getDeclaredFields()) { String usage = fieldUsage(field, extraHelp); if (usage != null) { - boolean coroutinesUsage = usage.contains("Xcoroutines"); - if (coroutinesUsage && coroutinesUsagePrinted) { - continue; - } else if (coroutinesUsage) { + if (usage.contains("Xcoroutines")) { + if (coroutinesUsagePrinted) continue; coroutinesUsagePrinted = true; } target.println(usage); @@ -89,6 +87,7 @@ class Usage { if (isXCoroutinesKey) { sb.append(" "); sb.append(coroutinesKeyDescription); + return sb.toString(); } int width = OPTION_NAME_PADDING_WIDTH - 1; diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index 0747d3bc3c2..b0bc787a8db 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -8,6 +8,5 @@ where advanced options include: -Xno-check-impl Do not check presence of 'impl' modifier in multi-platform projects -Xcoroutines={enable|warn|error} Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier - Advanced options are non-standard and may be changed or removed without any notice. OK \ No newline at end of file diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index dca6fa9f4cc..71c77f47b51 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -20,6 +20,5 @@ where advanced options include: -Xno-check-impl Do not check presence of 'impl' modifier in multi-platform projects -Xcoroutines={enable|warn|error} Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier - Advanced options are non-standard and may be changed or removed without any notice. OK \ No newline at end of file