refactor: fix default short help's formatting for long arg blurbs

Author: steverusso

help.go

@@ -66,30 +66,29 @@ func DefaultShortHelp(c *CommandInfo) string {
 				desc += " (required)"
 			}
 			if o.HasStrDefault {
-				desc += fmt.Sprintf(" (default: %v)", o.StrDefault)
+				desc += " (default: " + o.StrDefault + ")"
 			}
 			if o.EnvVar != "" {
 				desc += " [$" + o.EnvVar + "]"
 			}
-			var namesAndVal string
-			{
+
+			content := "  "
+			if o.NameShort != 0 {
+				content += "-" + string(o.NameShort)
+			}
+			if o.NameLong != "" {
 				if o.NameShort != 0 {
-					namesAndVal += "-" + string(o.NameShort)
-				}
-				if o.NameLong != "" {
-					if o.NameShort != 0 {
-						namesAndVal += ", "
-					}
-					namesAndVal += "--" + o.NameLong
-				}
-				if an := o.optUsgArgName(); an != "" {
-					namesAndVal += "  " + an
+					content += ", "
 				}
+				content += "--" + o.NameLong
+			}
+			if an := o.optUsgArgName(); an != "" {
+				content += "  " + an
 			}
-			content := "  " + namesAndVal
-			content += "\n" + strings.Repeat(" ", 6)
-			content += wrapBlurb(desc, 6, helpMsgTextWidth)
+
 			u.WriteString(content)
+			u.WriteString("\n" + strings.Repeat(" ", 6))
+			u.WriteString(wrapBlurb(desc, 6, helpMsgTextWidth))
 			u.WriteByte('\n')
 		}
 	} else {
@@ -99,14 +98,15 @@ func DefaultShortHelp(c *CommandInfo) string {
 				desc += " (required)"
 			}
 			if o.HasStrDefault {
-				desc += fmt.Sprintf(" (default: %v)", o.StrDefault)
+				desc += " (default: " + o.StrDefault + ")"
 			}
 			if o.EnvVar != "" {
 				desc += " [$" + o.EnvVar + "]"
 			}
-			content := fmt.Sprintf("  %-*s   ", optNameColWidth, optLeftPaddedNames[i])
-			content += wrapBlurb(desc, len(content), helpMsgTextWidth)
-			u.WriteString(content)
+			rightPadding := strings.Repeat(" ", (optNameColWidth-len(optLeftPaddedNames[i]))+3)
+			paddedNameAndVal := "  " + optLeftPaddedNames[i] + rightPadding
+			u.WriteString(paddedNameAndVal)
+			u.WriteString(wrapBlurb(desc, len(paddedNameAndVal), helpMsgTextWidth))
 			u.WriteByte('\n')
 		}
 	}
@@ -137,20 +137,21 @@ func DefaultShortHelp(c *CommandInfo) string {
 				desc += " (required)"
 			}
 			if a.HasStrDefault {
-				desc += fmt.Sprintf(" (default: %v)", a.StrDefault)
+				desc += " (default: " + a.StrDefault + ")"
 			}
 			if a.EnvVar != "" {
 				desc += " [$" + a.EnvVar + "]"
 			}
 
-			var content string
 			if argNameColWidth > helpShortMsgMaxFirstColLen {
 				u.WriteString("  " + argNames[i])
 				u.WriteString("\n" + strings.Repeat(" ", 5))
 				u.WriteString(wrapBlurb(desc, 5, helpMsgTextWidth))
 			} else {
-				fmt.Fprintf(&u, "  %-*s   ", argNameColWidth, argNames[i])
-				u.WriteString(wrapBlurb(desc, len(content)+3, helpMsgTextWidth))
+				rightPadding := strings.Repeat(" ", argNameColWidth-len(argNames[i])+3)
+				paddedNameCol := "  " + argNames[i] + rightPadding
+				u.WriteString(paddedNameCol)
+				u.WriteString(wrapBlurb(desc, len(paddedNameCol), helpMsgTextWidth))
 			}
 			u.WriteByte('\n')
 		}
@@ -192,7 +193,7 @@ func DefaultFullHelp(c *CommandInfo) string {
 	for i, o := range opts {
 		var extra string
 		if o.HasStrDefault {
-			extra += fmt.Sprintf("\n      [default: %v]", o.StrDefault)
+			extra += "\n      [default: " + o.StrDefault + "]"
 		}
 		if o.EnvVar != "" {
 			extra += "\n      [env: " + o.EnvVar + "]"
@@ -237,7 +238,7 @@ func DefaultFullHelp(c *CommandInfo) string {
 		for i, a := range c.Args {
 			var extra string
 			if a.HasStrDefault {
-				extra += fmt.Sprintf("\n      [default: %v]", a.StrDefault)
+				extra += "\n      [default: " + a.StrDefault + "]"
 			}
 			if a.EnvVar != "" {
 				extra += "\n      [env: " + a.EnvVar + "]"

help_test.go

@@ -92,6 +92,47 @@ arguments:
 
   [enim-ut-ad-minim-veniam]
       quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+`,
+		},
+		{
+			Case: ttCase(),
+			cmdInfo: New().
+				Help("test example").
+				Arg(NewArg("lorem").
+					Help("ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")).
+				Arg(NewArg("enim-ad-minim").
+					Help("veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.")),
+			expectedShort: `cli.test - test example
+
+usage:
+  cli.test [options] [arguments]
+
+options:
+  -h, --help   Show this help message and exit.
+
+arguments:
+  [lorem]           ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+                    tempor incididunt ut labore et dolore magna aliqua.
+  [enim-ad-minim]   veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
+                    ea commodo consequat.
+`,
+			expectedFull: `cli.test - test example
+
+usage:
+  cli.test [options] [arguments]
+
+options:
+  -h, --help
+      Show this help message and exit.
+
+arguments:
+  [lorem]
+      ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+      ut labore et dolore magna aliqua.
+
+  [enim-ad-minim]
+      veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat.
 `,
 		},
 	} {