Tweak spacing help text in error message when validation fails

Co-authored-by: Nate Cook <[email protected]>

Author: adellibovi

Sources/ArgumentParser/Usage/MessageInfo.swift

@@ -134,7 +134,7 @@ enum MessageInfo {
     case .help(text: let text):
       return text
     case .validation(message: let message, usage: let usage, help: let help):
-      let helpMessage = help.isEmpty ? "" : "Help: \(help)\n"
+      let helpMessage = help.isEmpty ? "" : "Help:  \(help)\n"
       let errorMessage = message.isEmpty ? "" : "\(args._errorLabel): \(message)\n"
       return errorMessage + helpMessage + usage
     case .other(let message, _):

Sources/ArgumentParser/Usage/UsageGenerator.swift

@@ -388,9 +388,9 @@ extension ErrorMessageGenerator {
 
     switch (name, valueName) {
     case let (n?, v?):
-      return "\(n.synopsisString) <\(v)> \(abstract)"
+      return "\(n.synopsisString) <\(v)>  \(abstract)"
     case let (_, v?):
-      return "<\(v)> \(abstract)"
+      return "<\(v)>  \(abstract)"
     case (_, _):
       return ""
     }

Tests/ArgumentParserEndToEndTests/TransformEndToEndTests.swift

@@ -40,7 +40,7 @@ fileprivate struct FooOption: Convert, ParsableArguments {
   Usage: foo_option --string <int_str>
     See 'foo_option --help' for more information.
   """
-  static var help: String = "Help: --string <int_str> Convert string to integer\n"
+  static var help: String = "Help:  --string <int_str>  Convert string to integer\n"
 
   @Option(help: ArgumentHelp("Convert string to integer", valueName: "int_str"),
           transform: { try convert($0) })
@@ -53,7 +53,7 @@ fileprivate struct BarOption: Convert, ParsableCommand {
   Usage: bar-option [--strings <int_str> ...]
     See 'bar-option --help' for more information.
   """
-  static var help: String = "Help: --strings <int_str> Convert a list of strings to an array of integers\n"
+  static var help: String = "Help:  --strings <int_str>  Convert a list of strings to an array of integers\n"
 
   @Option(help: ArgumentHelp("Convert a list of strings to an array of integers", valueName: "int_str"),
           transform: { try convert($0) })
@@ -103,7 +103,7 @@ fileprivate struct FooArgument: Convert, ParsableArguments {
   Usage: foo_argument <int_str>
     See 'foo_argument --help' for more information.
   """
-  static var help: String = "Help: <int_str> Convert string to integer\n"
+  static var help: String = "Help:  <int_str>  Convert string to integer\n"
 
   enum FooError: Error {
       case outOfBounds
@@ -120,7 +120,7 @@ fileprivate struct BarArgument: Convert, ParsableCommand {
   Usage: bar-argument [<int_str> ...]
     See 'bar-argument --help' for more information.
   """
-  static var help: String = "Help: <int_str> Convert a list of strings to an array of integers\n"
+  static var help: String = "Help:  <int_str>  Convert a list of strings to an array of integers\n"
 
   @Argument(help: ArgumentHelp("Convert a list of strings to an array of integers", valueName: "int_str"),
             transform: { try convert($0) })

Tests/ArgumentParserExampleTests/MathExampleTests.swift

@@ -167,7 +167,7 @@ final class MathExampleTests: XCTestCase {
       command: "math ZZZ",
       expected: """
             Error: The value 'ZZZ' is invalid for '<values>'
-            Help: <values> A group of integers to operate on.
+            Help:  <values>  A group of integers to operate on.
             Usage: math add [--hex-output] [<values> ...]
               See 'math add --help' for more information.
             """,

Tests/ArgumentParserExampleTests/RepeatExampleTests.swift

@@ -73,7 +73,7 @@ final class RepeatExampleTests: XCTestCase {
       command: "repeat hello --count ZZZ",
       expected: """
             Error: The value 'ZZZ' is invalid for '--count <count>'
-            Help: --count <count> The number of times to repeat 'phrase'.
+            Help:  --count <count>  The number of times to repeat 'phrase'.
             Usage: repeat [--count <count>] [--include-counter] <phrase>
               See 'repeat --help' for more information.
             """,

Tests/ArgumentParserExampleTests/RollDiceExampleTests.swift

@@ -49,7 +49,7 @@ final class RollDiceExampleTests: XCTestCase {
       command: "roll --times ZZZ",
       expected: """
             Error: The value 'ZZZ' is invalid for '--times <n>'
-            Help: --times <n> Rolls the dice <n> times.
+            Help:  --times <n>  Rolls the dice <n> times.
             Usage: roll [--times <n>] [--sides <m>] [--seed <seed>] [--verbose]
               See 'roll --help' for more information.
             """,