Pass each fish option spec to _swift_*_commands_and_positionals functions as a separate argument.

Signed-off-by: Ross Goldberg <[email protected]>

Author: rgoldberg

Sources/ArgumentParser/Completions/FishCompletionsGenerator.swift

@@ -26,14 +26,15 @@ extension [ParsableCommand.Type] {
           end
       end
 
-      function \(commandsAndPositionalsFunctionName)_helper -S -a argparse_options -a option_specs
+      function \(commandsAndPositionalsFunctionName)_helper -S -a argparse_options
+          set -l option_specs $argv[2..]
           set -a commands $positionals[1]
           set -e positionals[1]
           if test -z $argparse_options
-              argparse -n "$commands" (string split -- '\(separator)' $option_specs) -- $positionals 2> /dev/null
+              argparse -n "$commands" $option_specs -- $positionals 2> /dev/null
               set positionals $argv
           else
-              argparse (string split -- '\(separator)' $argparse_options) -n "$commands" (string split -- '\(separator)' $option_specs) -- $positionals 2> /dev/null
+              argparse (string split -- '\(separator)' $argparse_options) -n "$commands" $option_specs -- $positionals 2> /dev/null
               set positionals $argv
           end
       end
@@ -91,7 +92,12 @@ extension [ParsableCommand.Type] {
       case '\(last!._commandName)'
           \(commandsAndPositionalsFunctionName)_helper '\(
             subcommands.isEmpty ? "" : "-s"
-          )' '\(completableArguments.compactMap(\.optionSpec).map { "\($0)" }.joined(separator: separator))'\(
+          )' \(
+            completableArguments
+            .compactMap(\.optionSpec)
+            .map { "'\($0.fishEscapeForSingleQuotedString())'" }
+            .joined(separator: separator)
+          )\(
             subcommands.isEmpty
               ? ""
               : """

Tests/ArgumentParserExampleTests/Snapshots/testMathFishCompletionScript().fish

@@ -1,21 +1,21 @@
 function _swift_math_commands_and_positionals -S
     switch $positionals[1]
     case 'math'
-        _swift_math_commands_and_positionals_helper '-s' 'version h/help'
+        _swift_math_commands_and_positionals_helper '-s' 'version' 'h/help'
         switch $positionals[1]
         case 'add'
-            _swift_math_commands_and_positionals_helper '' 'x/hex-output version h/help'
+            _swift_math_commands_and_positionals_helper '' 'x/hex-output' 'version' 'h/help'
         case 'multiply'
-            _swift_math_commands_and_positionals_helper '' 'x/hex-output version h/help'
+            _swift_math_commands_and_positionals_helper '' 'x/hex-output' 'version' 'h/help'
         case 'stats'
-            _swift_math_commands_and_positionals_helper '-s' 'version h/help'
+            _swift_math_commands_and_positionals_helper '-s' 'version' 'h/help'
             switch $positionals[1]
             case 'average'
-                _swift_math_commands_and_positionals_helper '' 'kind= version h/help'
+                _swift_math_commands_and_positionals_helper '' 'kind=' 'version' 'h/help'
             case 'stdev'
-                _swift_math_commands_and_positionals_helper '' 'version h/help'
+                _swift_math_commands_and_positionals_helper '' 'version' 'h/help'
             case 'quantiles'
-                _swift_math_commands_and_positionals_helper '' 'file= directory= shell= custom= version h/help'
+                _swift_math_commands_and_positionals_helper '' 'file=' 'directory=' 'shell=' 'custom=' 'version' 'h/help'
             end
         case 'help'
             _swift_math_commands_and_positionals_helper '' 'version'
@@ -26,14 +26,15 @@ function _swift_math_commands_and_positionals -S
     end
 end
 
-function _swift_math_commands_and_positionals_helper -S -a argparse_options -a option_specs
+function _swift_math_commands_and_positionals_helper -S -a argparse_options
+    set -l option_specs $argv[2..]
     set -a commands $positionals[1]
     set -e positionals[1]
     if test -z $argparse_options
-        argparse -n "$commands" (string split -- ' ' $option_specs) -- $positionals 2> /dev/null
+        argparse -n "$commands" $option_specs -- $positionals 2> /dev/null
         set positionals $argv
     else
-        argparse (string split -- ' ' $argparse_options) -n "$commands" (string split -- ' ' $option_specs) -- $positionals 2> /dev/null
+        argparse (string split -- ' ' $argparse_options) -n "$commands" $option_specs -- $positionals 2> /dev/null
         set positionals $argv
     end
 end

Tests/ArgumentParserUnitTests/Snapshots/testBase_Fish().fish

@@ -1,21 +1,22 @@
 function _swift_base-test_commands_and_positionals -S
     switch $positionals[1]
     case 'base-test'
-        _swift_base-test_commands_and_positionals_helper '' 'name= kind= other-kind= path1= path2= path3= one two three kind-counter rep1= r/rep2= h/help'
+        _swift_base-test_commands_and_positionals_helper '' 'name=' 'kind=' 'other-kind=' 'path1=' 'path2=' 'path3=' 'one' 'two' 'three' 'kind-counter' 'rep1=' 'r/rep2=' 'h/help'
     case '*'
         set commands $positionals[1]
         set -e positionals[1]
     end
 end
 
-function _swift_base-test_commands_and_positionals_helper -S -a argparse_options -a option_specs
+function _swift_base-test_commands_and_positionals_helper -S -a argparse_options
+    set -l option_specs $argv[2..]
     set -a commands $positionals[1]
     set -e positionals[1]
     if test -z $argparse_options
-        argparse -n "$commands" (string split -- ' ' $option_specs) -- $positionals 2> /dev/null
+        argparse -n "$commands" $option_specs -- $positionals 2> /dev/null
         set positionals $argv
     else
-        argparse (string split -- ' ' $argparse_options) -n "$commands" (string split -- ' ' $option_specs) -- $positionals 2> /dev/null
+        argparse (string split -- ' ' $argparse_options) -n "$commands" $option_specs -- $positionals 2> /dev/null
         set positionals $argv
     end
 end