chore: resolve merge conflicts with upstream/main

Author: Chamepp

.github/workflows/pull_request.yml

@@ -25,6 +25,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
+      enable_macos_checks: true
 
   cmake-build:
     name: CMake Build

Examples/math/Math.swift

@@ -198,10 +198,17 @@ extension Math.Statistics {
     var oneOfFour: String?
 
     @Argument(
-      completion: .custom { _ in ["alabaster", "breakfast", "crunch", "crash"] }
+      completion: .custom { _, _, _ in
+        ["alabaster", "breakfast", "crunch", "crash"]
+      }
     )
     var customArg: String?
 
+    @Argument(
+      completion: .custom { _ in ["alabaster", "breakfast", "crunch", "crash"] }
+    )
+    var customDeprecatedArg: String?
+
     @Argument(help: "A group of floating-point values to operate on.")
     var values: [Double] = []
 
@@ -222,12 +229,16 @@ extension Math.Statistics {
     var directory: String?
 
     @Option(
-      completion: .shellCommand("head -100 /usr/share/dict/words | tail -50"))
+      completion: .shellCommand("head -100 /usr/share/dict/words | tail -50")
+    )
     var shell: String?
 
     @Option(completion: .custom(customCompletion))
     var custom: String?
 
+    @Option(completion: .custom(customDeprecatedCompletion))
+    var customDeprecated: String?
+
     func validate() throws {
       if testSuccessExitCode {
         throw ExitCode.success
@@ -248,7 +259,13 @@ extension Math.Statistics {
   }
 }
 
-func customCompletion(_ s: [String]) -> [String] {
+func customCompletion(_ s: [String], _: Int, _: Int) -> [String] {
+  (s.last ?? "").starts(with: "a")
+    ? ["aardvark", "aaaaalbert"]
+    : ["hello", "helicopter", "heliotrope"]
+}
+
+func customDeprecatedCompletion(_ s: [String]) -> [String] {
   (s.last ?? "").starts(with: "a")
     ? ["aardvark", "aaaaalbert"]
     : ["hello", "helicopter", "heliotrope"]

Sources/ArgumentParser/Completions/BashCompletionsGenerator.swift

@@ -21,6 +21,22 @@ extension [ParsableCommand.Type] {
     return """
       #!/bin/bash
 
+      \(cursorIndexInCurrentWordFunctionName)() {
+          local remaining="${COMP_LINE}"
+
+          local word
+          for word in "${COMP_WORDS[@]::COMP_CWORD}"; do
+              remaining="${remaining##*([[:space:]])"${word}"*([[:space:]])}"
+          done
+
+          local -ir index="$((COMP_POINT - ${#COMP_LINE} + ${#remaining}))"
+          if [[ "${index}" -le 0 ]]; then
+              printf 0
+          else
+              printf %s "${index}"
+          fi
+      }
+
       # positional arguments:
       #
       # - 1: the current (sub)command's count of positional arguments
@@ -365,6 +381,16 @@ extension [ParsableCommand.Type] {
         """
 
     case .custom:
+      // Generate a call back into the command to retrieve a completions list
+      return """
+        \(addCompletionsFunctionName) -W\
+         "$(\(customCompleteFunctionName) \(arg.customCompletionCall(self))\
+         "${COMP_CWORD}"\
+         "$(\(cursorIndexInCurrentWordFunctionName))")"
+
+        """
+
+    case .customDeprecated:
       // Generate a call back into the command to retrieve a completions list
       return """
         \(addCompletionsFunctionName) -W\
@@ -374,6 +400,10 @@ extension [ParsableCommand.Type] {
     }
   }
 
+  private var cursorIndexInCurrentWordFunctionName: String {
+    "_\(prefix(1).completionFunctionName().shellEscapeForVariableName())_cursor_index_in_current_word"
+  }
+
   private var offerFlagsOptionsFunctionName: String {
     "_\(prefix(1).completionFunctionName().shellEscapeForVariableName())_offer_flags_options"
   }

Sources/ArgumentParser/Completions/CompletionsGenerator.swift

@@ -138,7 +138,7 @@ struct CompletionsGenerator {
     case .bash:
       return [command].bashCompletionScript
     case .fish:
-      return FishCompletionsGenerator.generateCompletionScript(command)
+      return [command].fishCompletionScript
     default:
       fatalError("Invalid CompletionShell: \(shell)")
     }
@@ -149,12 +149,13 @@ extension ArgumentDefinition {
   /// Returns a string with the arguments for the callback to generate custom completions for
   /// this argument.
   func customCompletionCall(_ commands: [ParsableCommand.Type]) -> String {
-    let subcommandNames = commands.dropFirst().map { $0._commandName }.joined(
-      separator: " ")
+    let subcommandNames =
+      commands.dropFirst().map { "\($0._commandName) " }.joined()
     let argumentName =
       names.preferredName?.synopsisString
-      ?? self.help.keys.first?.fullPathString ?? "---"
-    return "---completion \(subcommandNames) -- \(argumentName)"
+      ?? self.help.keys.first?.fullPathString
+      ?? "---"
+    return "---completion \(subcommandNames)-- \(argumentName)"
   }
 }