Backwards compatibility in fish completion scripts with fish 3.3.x-

Change set -f to set -l.

Replace $(…) with (…) command substitutions.

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

Author: rgoldberg

Sources/ArgumentParser/Completions/FishCompletionsGenerator.swift

@@ -18,9 +18,9 @@ extension [ParsableCommand.Type] {
     let commandName = first!._commandName
     return """
       function \(shouldOfferCompletionsForFunctionName) -a expected_commands -a expected_positional_index
-          set -f unparsed_tokens (\(tokensFunctionName) -pc)
-          set -f positional_index 0
-          set -f commands
+          set -l unparsed_tokens (\(tokensFunctionName) -pc)
+          set -l positional_index 0
+          set -l commands
 
           switch $unparsed_tokens[1]
       \(commandCases)
@@ -30,7 +30,7 @@ extension [ParsableCommand.Type] {
       end
 
       function \(tokensFunctionName)
-          if test "$(string split -m 1 -f 1 -- . "$FISH_VERSION")" -gt 3
+          if test (string split -m 1 -f 1 -- . "$FISH_VERSION") -gt 3
               commandline --tokens-raw $argv
           else
               commandline -o $argv
@@ -39,8 +39,8 @@ extension [ParsableCommand.Type] {
 
       function \(parseSubcommandFunctionName) -S
           argparse -s r -- $argv
-          set -f positional_count $argv[1]
-          set -f option_specs $argv[2..]
+          set -l positional_count $argv[1]
+          set -l option_specs $argv[2..]
 
           set -a commands $unparsed_tokens[1]
           set -e unparsed_tokens[1]
@@ -59,20 +59,20 @@ extension [ParsableCommand.Type] {
       end
 
       function \(completeDirectoriesFunctionName)
-          set -f token (commandline -t)
+          set -l token (commandline -t)
           string match -- '*/' $token
-          set -f subdirs $token*/
+          set -l subdirs $token*/
           printf '%s\\n' $subdirs
       end
 
       function \(customCompletionFunctionName)
           set -x \(CompletionShell.shellEnvironmentVariableName) fish
           set -x \(CompletionShell.shellVersionEnvironmentVariableName) $FISH_VERSION
 
-          set -f tokens (\(tokensFunctionName) -p)
-          if test -z "$(\(tokensFunctionName) -t)"
-              set -f index (count (\(tokensFunctionName) -pc))
-              set -f tokens $tokens[..$index] \\'\\' $tokens[$(math $index + 1)..]
+          set -l tokens (\(tokensFunctionName) -p)
+          if test -z (\(tokensFunctionName) -t)
+              set -l index (count (\(tokensFunctionName) -pc))
+              set tokens $tokens[..$index] \\'\\' $tokens[(math $index + 1)..]
           end
           command $tokens[1] $argv $tokens
       end

Tests/ArgumentParserExampleTests/Snapshots/testMathFishCompletionScript().fish

@@ -1,7 +1,7 @@
 function _swift_math_should_offer_completions_for -a expected_commands -a expected_positional_index
-    set -f unparsed_tokens (_swift_math_tokens -pc)
-    set -f positional_index 0
-    set -f commands
+    set -l unparsed_tokens (_swift_math_tokens -pc)
+    set -l positional_index 0
+    set -l commands
 
     switch $unparsed_tokens[1]
     case 'math'
@@ -39,8 +39,8 @@ end
 
 function _swift_math_parse_subcommand -S
     argparse -s r -- $argv
-    set -f positional_count $argv[1]
-    set -f option_specs $argv[2..]
+    set -l positional_count $argv[1]
+    set -l option_specs $argv[2..]
 
     set -a commands $unparsed_tokens[1]
     set -e unparsed_tokens[1]
@@ -59,20 +59,20 @@ function _swift_math_parse_subcommand -S
 end
 
 function _swift_math_complete_directories
-    set -f token (commandline -t)
+    set -l token (commandline -t)
     string match -- '*/' $token
-    set -f subdirs $token*/
+    set -l subdirs $token*/
     printf '%s\n' $subdirs
 end
 
 function _swift_math_custom_completion
     set -x SAP_SHELL fish
     set -x SAP_SHELL_VERSION $FISH_VERSION
 
-    set -f tokens (_swift_math_tokens -p)
+    set -l tokens (_swift_math_tokens -p)
     if test -z "$(_swift_math_tokens -t)"
-        set -f index (count (_swift_math_tokens -pc))
-        set -f tokens $tokens[..$index] \'\' $tokens[$(math $index + 1)..]
+        set -l index (count (_swift_math_tokens -pc))
+        set tokens $tokens[..$index] \'\' $tokens[$(math $index + 1)..]
     end
     command $tokens[1] $argv $tokens
 end

Tests/ArgumentParserUnitTests/Snapshots/testBase_Fish().fish

@@ -1,7 +1,7 @@
 function _swift_base-test_should_offer_completions_for -a expected_commands -a expected_positional_index
-    set -f unparsed_tokens (_swift_base-test_tokens -pc)
-    set -f positional_index 0
-    set -f commands
+    set -l unparsed_tokens (_swift_base-test_tokens -pc)
+    set -l positional_index 0
+    set -l commands
 
     switch $unparsed_tokens[1]
     case 'base-test'
@@ -29,8 +29,8 @@ end
 
 function _swift_base-test_parse_subcommand -S
     argparse -s r -- $argv
-    set -f positional_count $argv[1]
-    set -f option_specs $argv[2..]
+    set -l positional_count $argv[1]
+    set -l option_specs $argv[2..]
 
     set -a commands $unparsed_tokens[1]
     set -e unparsed_tokens[1]
@@ -49,20 +49,20 @@ function _swift_base-test_parse_subcommand -S
 end
 
 function _swift_base-test_complete_directories
-    set -f token (commandline -t)
+    set -l token (commandline -t)
     string match -- '*/' $token
-    set -f subdirs $token*/
+    set -l subdirs $token*/
     printf '%s\n' $subdirs
 end
 
 function _swift_base-test_custom_completion
     set -x SAP_SHELL fish
     set -x SAP_SHELL_VERSION $FISH_VERSION
 
-    set -f tokens (_swift_base-test_tokens -p)
+    set -l tokens (_swift_base-test_tokens -p)
     if test -z "$(_swift_base-test_tokens -t)"
-        set -f index (count (_swift_base-test_tokens -pc))
-        set -f tokens $tokens[..$index] \'\' $tokens[$(math $index + 1)..]
+        set -l index (count (_swift_base-test_tokens -pc))
+        set tokens $tokens[..$index] \'\' $tokens[$(math $index + 1)..]
     end
     command $tokens[1] $argv $tokens
 end