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

Fix usage printing for compiler plugins

Browse Source
This commit is contained in:
Yan Zhulanow
2015-04-15 18:24:07 +03:00
parent fdc253b67f
commit dbc0099e6e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt
+4 -2
View File
@@ -45,8 +45,10 @@ public fun cliPluginUsageString(pluginId: String, options: Collection<CliOption>
"\n" + " ".repeat(MAX_OPTION_WIDTH + LEFT_INDENT + 1) "\n" + " ".repeat(MAX_OPTION_WIDTH + LEFT_INDENT + 1)
} else " ".repeat(1 + MAX_OPTION_WIDTH - name.length()) } else " ".repeat(1 + MAX_OPTION_WIDTH - name.length())
val modifiers = (if (it.required) "required" else "") + (if (it.allowMultipleOccurrences) "multiple" else "") val modifiers = listOf(
val modifiersEnclosed = if (modifiers.isNotEmpty()) " ($modifiers)" else "" 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 " ".repeat(LEFT_INDENT) + name + margin + it.description + modifiersEnclosed
} }
compiler/testData/cli/jvm/pluginSimpleUsage.out
+1 -1
View File
@@ -1,7 +1,7 @@
ERROR: Required plugin option not present: org.jetbrains.kotlin.android:androidRes ERROR: Required plugin option not present: org.jetbrains.kotlin.android:androidRes
Plugin "org.jetbrains.kotlin.android" usage: Plugin "org.jetbrains.kotlin.android" usage:
androidRes <path> Android resources path (required) androidRes <path> Android resources path (required, multiple)
androidManifest <path> Android manifest file (required) androidManifest <path> Android manifest file (required)
supportV4 <path> Support android-v4 library supportV4 <path> Support android-v4 library