Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/ArgumentParser/Parsing/ArgumentSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,14 @@ extension ArgumentSet {
case(true, let previous?, .exclusive):
// This value has already been set.
throw ParserError.duplicateExclusiveValues(previous: previous.inputOrigin, duplicate: origin, originalInput: values.originalInput)
case (true, _, .chooseFirst):
values.update(forKey: key, inputOrigin: origin, initial: value, closure: { _ in })
case (false, _, _), (_, _, .chooseLast):
values.set(value, forKey: key, inputOrigin: origin)
return true
default:
return hasUpdated
break
}
return true
}

/// Creates an argument set for a pair of inverted Boolean flags.
Expand Down
29 changes: 25 additions & 4 deletions Tests/EndToEndTests/FlagsEndToEndTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ extension FlagsEndToEndTests {
AssertParse(Bar.self, ["--enable-logging"]) { options in
XCTAssertEqual(options.logging, true)
}
// Can't test this yet, because .chooseFirst flags don't work
// AssertParse(Bar.self, ["--enable-logging", "--disable-logging"]) { options in
// XCTAssertEqual(options.logging, false)
// }
AssertParse(Bar.self, ["--disable-logging", "--enable-logging"]) { options in
XCTAssertEqual(options.logging, false)
}
}
}

Expand Down Expand Up @@ -263,3 +262,25 @@ extension FlagsEndToEndTests {
XCTAssertThrowsError(try Qux.parse(["--pink", "--small", "--bloop"]))
}
}

fileprivate struct RepeatOK: ParsableArguments {
@Flag(exclusivity: .chooseFirst)
var color: Color

@Flag(exclusivity: .chooseLast)
var shape: Shape
}

extension FlagsEndToEndTests {
func testParsingCaseIterable_RepeatableFlags() throws {
AssertParse(RepeatOK.self, ["--pink", "--purple", "--square"]) { options in
XCTAssertEqual(options.color, .pink)
XCTAssertEqual(options.shape, .square)
}

AssertParse(RepeatOK.self, ["--round", "--oblong", "--silver"]) { options in
XCTAssertEqual(options.color, .silver)
XCTAssertEqual(options.shape, .oblong)
}
}
}