From dbc0099e6ea1da536fef439612726b1bb8eec5f2 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 15 Apr 2015 18:24:07 +0300 Subject: [PATCH] Fix usage printing for compiler plugins --- .../src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt | 6 ++++-- compiler/testData/cli/jvm/pluginSimpleUsage.out | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt index ad2f64294cf..8bdb81de834 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt @@ -45,8 +45,10 @@ public fun cliPluginUsageString(pluginId: String, options: Collection "\n" + " ".repeat(MAX_OPTION_WIDTH + LEFT_INDENT + 1) } else " ".repeat(1 + MAX_OPTION_WIDTH - name.length()) - val modifiers = (if (it.required) "required" else "") + (if (it.allowMultipleOccurrences) "multiple" else "") - val modifiersEnclosed = if (modifiers.isNotEmpty()) " ($modifiers)" else "" + val modifiers = listOf( + if (it.required) "required" else null, + if (it.allowMultipleOccurrences) "multiple" else null).filterNotNull() + val modifiersEnclosed = if (modifiers.isEmpty()) "" else " (${modifiers.joinToString()})" " ".repeat(LEFT_INDENT) + name + margin + it.description + modifiersEnclosed } diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.out b/compiler/testData/cli/jvm/pluginSimpleUsage.out index 6120b1bfeb6..792e43f8277 100644 --- a/compiler/testData/cli/jvm/pluginSimpleUsage.out +++ b/compiler/testData/cli/jvm/pluginSimpleUsage.out @@ -1,7 +1,7 @@ ERROR: Required plugin option not present: org.jetbrains.kotlin.android:androidRes Plugin "org.jetbrains.kotlin.android" usage: - androidRes Android resources path (required) + androidRes Android resources path (required, multiple) androidManifest Android manifest file (required) supportV4 Support android-v4 library