Skip to content

Allows single- and double-dashed args with the same name #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2020
Merged

Allows single- and double-dashed args with the same name #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/ArgumentParser/Parsable Types/ParsableArgumentsValidation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ struct ParsableArgumentsUniqueNamesValidator: ParsableArgumentsValidator {
switch args.content {
case .arguments(let defs):
for name in defs.flatMap({ $0.names }) {
countedNames[name.valueString, default: 0] += 1
countedNames[name.synopsisString, default: 0] += 1
}
default:
break
Expand Down
18 changes: 9 additions & 9 deletions Tests/ArgumentParserUnitTests/ParsableArgumentsValidationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ final class ParsableArgumentsValidationTests: XCTestCase {
if let error = ParsableArgumentsUniqueNamesValidator.validate(TwoOfTheSameName.self)
as? ParsableArgumentsUniqueNamesValidator.Error
{
XCTAssertEqual(error.description, "Multiple (2) `Option` or `Flag` arguments are named \"foo\".")
XCTAssertEqual(error.description, "Multiple (2) `Option` or `Flag` arguments are named \"--foo\".")
} else {
XCTFail(unexpectedErrorMessage)
}
Expand All @@ -250,7 +250,7 @@ final class ParsableArgumentsValidationTests: XCTestCase {
@Flag(name: .customLong("bar"))
var notBar: Bool = false

@Option()
@Option(name: [.long, .customLong("help", withSingleDash: true)])
var help: String
}

Expand All @@ -261,12 +261,12 @@ final class ParsableArgumentsValidationTests: XCTestCase {
XCTAssert(
/// The `Mirror` reflects the properties `foo` and `bar` in a random order each time it's built.
error.description == """
Multiple (2) `Option` or `Flag` arguments are named \"bar\".
Multiple (2) `Option` or `Flag` arguments are named \"foo\".
Multiple (2) `Option` or `Flag` arguments are named \"--bar\".
Multiple (2) `Option` or `Flag` arguments are named \"--foo\".
"""
|| error.description == """
Multiple (2) `Option` or `Flag` arguments are named \"foo\".
Multiple (2) `Option` or `Flag` arguments are named \"bar\".
Multiple (2) `Option` or `Flag` arguments are named \"--foo\".
Multiple (2) `Option` or `Flag` arguments are named \"--bar\".
"""
)
} else {
Expand All @@ -293,7 +293,7 @@ final class ParsableArgumentsValidationTests: XCTestCase {
if let error = ParsableArgumentsUniqueNamesValidator.validate(MultipleNamesPerArgument.self)
as? ParsableArgumentsUniqueNamesValidator.Error
{
XCTAssertEqual(error.description, "Multiple (2) `Option` or `Flag` arguments are named \"v\".")
XCTAssertEqual(error.description, "Multiple (2) `Option` or `Flag` arguments are named \"-v\".")
} else {
XCTFail(unexpectedErrorMessage)
}
Expand Down Expand Up @@ -324,7 +324,7 @@ final class ParsableArgumentsValidationTests: XCTestCase {
if let error = ParsableArgumentsUniqueNamesValidator.validate(FourDuplicateNames.self)
as? ParsableArgumentsUniqueNamesValidator.Error
{
XCTAssertEqual(error.description, "Multiple (4) `Option` or `Flag` arguments are named \"foo\".")
XCTAssertEqual(error.description, "Multiple (4) `Option` or `Flag` arguments are named \"--foo\".")
} else {
XCTFail(unexpectedErrorMessage)
}
Expand Down Expand Up @@ -366,7 +366,7 @@ final class ParsableArgumentsValidationTests: XCTestCase {
if let error = ParsableArgumentsUniqueNamesValidator.validate(DuplicatedFirstLettersShortNames.self)
as? ParsableArgumentsUniqueNamesValidator.Error
{
XCTAssertEqual(error.description, "Multiple (3) `Option` or `Flag` arguments are named \"f\".")
XCTAssertEqual(error.description, "Multiple (3) `Option` or `Flag` arguments are named \"-f\".")
} else {
XCTFail(unexpectedErrorMessage)
}
Expand Down