gopkg/kong
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add negatable output when using short flag names

Browse Source
This commit is contained in:
Joe Schmitt
2021-03-01 16:41:31 -05:00
committed by Alec Thomas
parent ed24960916
commit d48f4e59c3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
help.go
+10 -6
View File
@@ -469,17 +469,21 @@ func formatFlag(haveShort bool, flag *Flag) string {
name := flag.Name name := flag.Name
isBool := flag.IsBool() isBool := flag.IsBool()
if flag.Short != 0 { if flag.Short != 0 {
flagString += fmt.Sprintf("-%c, --%s", flag.Short, name) if isBool && flag.Tag.Negatable {
flagString += fmt.Sprintf("-%c, --[no-]%s", flag.Short, name)
} else {
flagString += fmt.Sprintf("-%c, --%s", flag.Short, name)
}
} else { } else {
if haveShort { if isBool && flag.Tag.Negatable {
if isBool && flag.Tag.Negatable { if haveShort {
flagString = fmt.Sprintf(" --[no-]%s", name) flagString = fmt.Sprintf(" --[no-]%s", name)
} else { } else {
flagString += fmt.Sprintf(" --%s", name) flagString = fmt.Sprintf("--[no-]%s", name)
} }
} else { } else {
if isBool && flag.Tag.Negatable { if haveShort {
flagString = fmt.Sprintf("--[no-]%s", name) flagString += fmt.Sprintf(" --%s", name)
} else { } else {
flagString += fmt.Sprintf("--%s", name) flagString += fmt.Sprintf("--%s", name)
} }
help_test.go
+3 -3
View File
@@ -29,7 +29,7 @@ func TestHelp(t *testing.T) {
Slice []string `help:"A slice of strings." placeholder:"STR"` Slice []string `help:"A slice of strings." placeholder:"STR"`
Map map[string]int `help:"A map of strings to ints."` Map map[string]int `help:"A map of strings to ints."`
Required bool `required help:"A required flag."` Required bool `required help:"A required flag."`
Sort bool `negatable help:"Is sortable or not."` Sort bool `negatable short:"s" help:"Is sortable or not."`
One struct { One struct {
Flag string `help:"Nested flag."` Flag string `help:"Nested flag."`
@@ -76,7 +76,7 @@ Flags:
--slice=STR,... A slice of strings. --slice=STR,... A slice of strings.
--map=KEY=VALUE;... A map of strings to ints. --map=KEY=VALUE;... A map of strings to ints.
--required A required flag. --required A required flag.
--[no-]sort Is sortable or not. -s, --[no-]sort Is sortable or not.
Commands: Commands:
one --required one --required
@@ -117,7 +117,7 @@ Flags:
--slice=STR,... A slice of strings. --slice=STR,... A slice of strings.
--map=KEY=VALUE;... A map of strings to ints. --map=KEY=VALUE;... A map of strings to ints.
--required A required flag. --required A required flag.
--[no-]sort Is sortable or not. -s, --[no-]sort Is sortable or not.
--flag=STRING Nested flag under two. --flag=STRING Nested flag under two.
--required-two --required-two