Fix switch end keyword bugs in _swift_*_commands_and_positionals fish functions.

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

Author: rgoldberg

Sources/ArgumentParser/Completions/FishCompletionsGenerator.swift

@@ -19,8 +19,7 @@ extension [ParsableCommand.Type] {
     return """
       function \(commandsAndPositionalsFunctionName) -S
           switch $POSITIONALS[1]
-      \(commandCases)\
-              end
+      \(commandCases)
           case '*'
               set COMMANDS $POSITIONALS[1]
               set -e POSITIONALS[1]
@@ -91,11 +90,19 @@ extension [ParsableCommand.Type] {
     return """
       case '\(last!._commandName)'
           \(commandsAndPositionalsFunctionName)_helper '\(
-          subcommands.isEmpty ? "" : "-s"
+            subcommands.isEmpty ? "" : "-s"
           )' '\(completableArguments.compactMap(\.optionSpec).map { "\($0)" }.joined(separator: separator))'\(
-      subcommands.isEmpty ? "" : "\n    switch $POSITIONALS[1]")
-      \(subcommands.map { (self + [$0]).commandCases }.joined(separator: ""))
-      """.indentingEachLine(by: 4)
+            subcommands.isEmpty ?
+              ""
+              : """
+
+                  switch $POSITIONALS[1]
+              \(subcommands.map { (self + [$0]).commandCases }.joined(separator: "\n"))
+                  end
+              """
+          )
+      """
+      .indentingEachLine(by: 4)
   }
 
   private var completions: [String] {

Tests/ArgumentParserExampleTests/Snapshots/testMathFishCompletionScript().fish

@@ -16,6 +16,7 @@ function _swift_math_commands_and_positionals -S
                 _swift_math_commands_and_positionals_helper '' 'version h/help'
             case 'quantiles'
                 _swift_math_commands_and_positionals_helper '' 'file= directory= shell= custom= version h/help'
+            end
         case 'help'
             _swift_math_commands_and_positionals_helper '' 'version'
         end

Tests/ArgumentParserUnitTests/Snapshots/testBase_Fish().fish

@@ -2,7 +2,6 @@ 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'
-        end
     case '*'
         set COMMANDS $POSITIONALS[1]
         set -e POSITIONALS[1]