Nonexclusive flags implemented via an array of enum cases are now separate ArgumentInfoV0 instances, instead of different names for the same ArgumentInfoV0.

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

Author: rgoldberg

Sources/ArgumentParser/Usage/DumpHelpGenerator.swift

@@ -52,41 +52,6 @@ extension BidirectionalCollection where Element == ParsableCommand.Type {
   }
 }
 
-extension ArgumentSet {
-  fileprivate func mergingCompositeArguments() -> ArgumentSet {
-    var arguments = ArgumentSet()
-    var slice = self[...]
-    while var argument = slice.popFirst() {
-      if argument.help.isComposite {
-        // If this argument is composite, we have a group of arguments to
-        // merge together.
-        let groupEnd =
-          slice
-          .firstIndex { $0.help.keys != argument.help.keys }
-          ?? slice.endIndex
-        let group = [argument] + slice[..<groupEnd]
-        slice = slice[groupEnd...]
-
-        switch argument.kind {
-        case .named:
-          argument.kind = .named(group.flatMap(\.names))
-        case .positional, .default:
-          break
-        }
-
-        argument.help.valueName =
-          group.map(\.valueName).first { !$0.isEmpty } ?? ""
-        argument.help.defaultValue = group.compactMap(\.help.defaultValue).first
-        argument.help.abstract =
-          group.map(\.help.abstract).first { !$0.isEmpty } ?? ""
-        argument.help.discussion = group.compactMap(\.help.discussion).first
-      }
-      arguments.append(argument)
-    }
-    return arguments
-  }
-}
-
 extension ToolInfoV0 {
   init(commandStack: [ParsableCommand.Type]) {
     self.init(command: CommandInfoV0(commandStack: commandStack))
@@ -123,7 +88,6 @@ extension CommandInfoV0 {
     let arguments =
       commandStack
       .allArguments()
-      .mergingCompositeArguments()
       .compactMap(ArgumentInfoV0.init)
 
     self = CommandInfoV0(

Tests/ArgumentParserUnitTests/Snapshots/testBase_Fish().fish

@@ -74,7 +74,9 @@ complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l path1 -rF
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l path2 -rF
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l path3 -rfka 'c1_fish c2_fish c3_fish'
-complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l one -l two -l three
+complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l one
+complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l two
+complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l three
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l kind-counter
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -l rep1 -rfka ''
 complete -c 'base-test' -n '__base-test_should_offer_completions_for "base-test"' -s r -l rep2 -rfka ''