Skip to content
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

Jump to bottom

Unify @Argument and @Option initialization paths #477

Merged
merged 2 commits into from Sep 10, 2022
Merged

Unify @Argument and @Option initialization paths #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16141d8
Unify @Argument and @Option initialization paths
rauhul Aug 26, 2022
bebda5b
review feedback
rauhul Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
584 changes: 326 additions & 258 deletions Sources/ArgumentParser/Parsable Properties/Argument.swift
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 24 additions & 3 deletions Sources/ArgumentParser/Parsable Properties/Flag.swift
View file
Open in desktop
Expand Up @@ -400,7 +400,13 @@ extension Flag where Value: EnumerableFlag {
let caseKey = InputKey(rawValue: String(describing: value))
let name = Value.name(for: value)
let helpForCase = hasCustomCaseHelp ? (caseHelps[i] ?? help) : help
let help = ArgumentDefinition.Help(options: initial != nil ? .isOptional : [], help: helpForCase, defaultValue: defaultValue, key: key, isComposite: !hasCustomCaseHelp)
let help = ArgumentDefinition.Help(
allValues: [],
options: initial != nil ? [.isOptional] : [],
help: helpForCase,
defaultValue: defaultValue,
key: key,
isComposite: !hasCustomCaseHelp)
return ArgumentDefinition.flag(name: name, key: key, caseKey: caseKey, help: help, parsingStrategy: .default, initialValue: initial, update: .nullary({ (origin, name, values) in
hasUpdated = try ArgumentSet.updateFlag(key: key, value: value, origin: origin, values: &values, hasUpdated: hasUpdated, exclusivity: exclusivity)
}))
Expand Down Expand Up @@ -489,7 +495,15 @@ extension Flag {
let caseKey = InputKey(rawValue: String(describing: value))
let name = Element.name(for: value)
let helpForCase = hasCustomCaseHelp ? (caseHelps[i] ?? help) : help
let help = ArgumentDefinition.Help(options: .isOptional, help: helpForCase, key: key, isComposite: !hasCustomCaseHelp)

let help = ArgumentDefinition.Help(
allValues: [],
options: [.isOptional],
help: helpForCase,
defaultValue: nil,
key: key,
isComposite: !hasCustomCaseHelp)

return ArgumentDefinition.flag(name: name, key: key, caseKey: caseKey, help: help, parsingStrategy: .default, initialValue: nil as Element?, update: .nullary({ (origin, name, values) in
hasUpdated = try ArgumentSet.updateFlag(key: key, value: value, origin: origin, values: &values, hasUpdated: hasUpdated, exclusivity: exclusivity)
}))
Expand All @@ -514,7 +528,14 @@ extension Flag {
let caseKey = InputKey(rawValue: String(describing: value))
let name = Element.name(for: value)
let helpForCase = hasCustomCaseHelp ? (caseHelps[i] ?? help) : help
let help = ArgumentDefinition.Help(options: .isOptional, help: helpForCase, key: key, isComposite: !hasCustomCaseHelp)
let help = ArgumentDefinition.Help(
allValues: [],
options: [.isOptional],
help: helpForCase,
defaultValue: nil,
key: key,
isComposite: !hasCustomCaseHelp)

return ArgumentDefinition.flag(name: name, key: key, caseKey: caseKey, help: help, parsingStrategy: .default, initialValue: initial, update: .nullary({ (origin, name, values) in
values.update(forKey: key, inputOrigin: origin, initial: [Element](), closure: {
$0.append(value)
Expand Down