x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy up the flag name visitor func in Context

Browse Source
This commit is contained in:
Dan Buch 2016-05-17 03:46:16 -04:00
parent 7828300b97
commit 7318e27528
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
context.go
View File

@ -137,11 +137,9 @@ func (c *Context) LocalFlagNames() []string {
// its parent contexts. // its parent contexts.
func (c *Context) FlagNames() []string { func (c *Context) FlagNames() []string {
names := []string{} names := []string{}
for _, ctx := range c.Lineage() { for _, ctx := range c.Lineage() {
ctx.flagSet.Visit(makeFlagNameVisitor(&names)) ctx.flagSet.Visit(makeFlagNameVisitor(&names))
} }
return names return names
} }
@ -362,8 +360,17 @@ func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
func makeFlagNameVisitor(names *[]string) func(*flag.Flag) { func makeFlagNameVisitor(names *[]string) func(*flag.Flag) {
return func(f *flag.Flag) { return func(f *flag.Flag) {
name := strings.Split(f.Name, ",")[0] nameParts := strings.Split(f.Name, ",")
if name != "help" && name != "version" { name := strings.TrimSpace(nameParts[0])
for _, part := range nameParts {
part = strings.TrimSpace(part)
if len(part) > len(name) {
name = part
}
}
if name != "" {
(*names) = append(*names, name) (*names) = append(*names, name)
} }
} }