more error message adjustments

TheFrontier · Feb 16, 2020 · a5d6a5b · a5d6a5b
1 parent 3b6be6e
commit a5d6a5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "pw.dotdash"
-    version = "0.15.0"
+    version = "0.16.0"
 
     apply(plugin = "maven")
 }

diff --git a/director-core/src/main/kotlin/pw/dotdash/director/core/tree/simple/SimpleCommandTree.kt b/director-core/src/main/kotlin/pw/dotdash/director/core/tree/simple/SimpleCommandTree.kt
@@ -196,15 +196,7 @@ internal sealed class SimpleCommandTree<S, V : HList<V>, R>(
         }
 
     override fun getUsage(source: S): String {
-        val builder = StringBuilder()
-
-        if (this.children.isNotEmpty()) {
-            this.children.keys.joinTo(builder, separator = "|", postfix = "|")
-        }
-
-        this.argSequence.joinTo(builder, separator = " ") { it.parameter.getUsage(source) }
-
-        return builder.toString()
+        return this.argSequence.joinToString(separator = " ") { it.parameter.getUsage(source) }
     }
 
     @Suppress("UNCHECKED_CAST")

diff --git a/director-sponge/src/main/kotlin/pw/dotdash/director/sponge/CommandTreeCallable.kt b/director-sponge/src/main/kotlin/pw/dotdash/director/sponge/CommandTreeCallable.kt
@@ -73,7 +73,10 @@ class CommandTreeCallable<V : HList<V>>(
             .append(ERROR_FROM, this.rootAlias, COLON, NEW_LINE, Text.of(cause.message))
 
         if (cause is ArgumentParseException) {
-            builder.append(NEW_LINE, Text.of(cause.annotatedPosition))
+            val annotated: String = cause.annotatedPosition
+            if (annotated.isNotBlank()) {
+                builder.append(NEW_LINE, Text.of(annotated))
+            }
         }
 
         if (e.cause.showUsage) {