Fix zsh dashes in command names

Author: adellibovi

Sources/ArgumentParser/Completions/ZshCompletionsGenerator.swift

@@ -12,12 +12,13 @@
 struct ZshCompletionsGenerator {
   /// Generates a Zsh completion script for the given command.
   static func generateCompletionScript(_ type: ParsableCommand.Type) -> String {
-    let initialFunctionName = [type].completionFunctionName()
+    let initialFunctionName = [type].completionFunctionName().zshEscapingCommandName()
+    let commandName = type._commandName.zshEscapingCommandName()
 
     return """
-    #compdef \(type._commandName)
+    #compdef \(commandName)
     local context state state_descr line
-    _\(type._commandName)_commandname=$words[1]
+    _\(commandName)_commandname=$words[1]
     typeset -A opt_args
 
     \(generateCompletionFunction([type]))
@@ -32,7 +33,7 @@ struct ZshCompletionsGenerator {
 
   static func generateCompletionFunction(_ commands: [ParsableCommand.Type]) -> String {
     let type = commands.last!
-    let functionName = commands.completionFunctionName()
+    let functionName = commands.completionFunctionName().zshEscapingCommandName()
     let isRootCommand = commands.count == 1
 
     var args = generateCompletionArguments(commands)
@@ -50,14 +51,14 @@ struct ZshCompletionsGenerator {
 
       let subcommandModes = subcommands.map {
         """
-        '\($0._commandName):\($0.configuration.abstract.zshEscaped())'
+        '\($0._commandName.zshEscapingCommandName()):\($0.configuration.abstract.zshEscaped())'
         """
         .indentingEachLine(by: 12)
       }
       let subcommandArgs = subcommands.map {
         """
-        (\($0._commandName))
-            \(functionName)_\($0._commandName)
+        (\($0._commandName.zshEscapingCommandName()))
+            \(functionName)_\($0._commandName.zshEscaped())
             ;;
         """
         .indentingEachLine(by: 12)
@@ -122,6 +123,10 @@ extension String {
   fileprivate func zshEscaped() -> String {
     self.zshEscapingSingleQuotes().zshEscapingMetacharacters()
   }
+  
+  fileprivate func zshEscapingCommandName() -> String {
+    self.replacingOccurrences(of: "-", with: "_")
+  }
 }
 
 extension ArgumentDefinition {
@@ -187,7 +192,7 @@ extension ArgumentDefinition {
 
     case .custom:
       // Generate a call back into the command to retrieve a completions list
-      let commandName = commands.first!._commandName
+      let commandName = commands.first!._commandName.zshEscapingCommandName()
       return "{_custom_completion $_\(commandName)_commandname \(customCompletionCall(commands)) $words}"
     }
   }

Tests/ArgumentParserUnitTests/CompletionScriptTests.swift

@@ -125,13 +125,13 @@ extension CompletionScriptTests {
 }
 
 extension CompletionScriptTests {
-  struct Escaped: ParsableCommand {
+  struct EscapedCommand: ParsableCommand {
     @Option(help: #"Escaped chars: '[]\."#)
     var one: String
   }
 
   func testEscaped_Zsh() throws {
-    XCTAssertEqual(zshEscapedCompletion, Escaped.completionScript(for: .zsh))
+    XCTAssertEqual(zshEscapedCompletion, EscapedCommand.completionScript(for: .zsh))
   }
 }
 
@@ -213,12 +213,12 @@ complete -F _base base
 """
 
 private let zshEscapedCompletion = """
-#compdef escaped
+#compdef escaped_command
 local context state state_descr line
-_escaped_commandname=$words[1]
+_escaped_command_commandname=$words[1]
 typeset -A opt_args
 
-_escaped() {
+_escaped_command() {
     integer ret=1
     local -a args
     args+=(
@@ -236,7 +236,7 @@ _custom_completion() {
     _describe '' completions
 }
 
-_escaped
+_escaped_command
 """
 
 private let fishBaseCompletions = """