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

Use existing prefixedNames func

Browse Source
This commit is contained in:
Dan Buch 2016-05-02 19:52:39 -04:00
parent 7de151883c
commit 6089d723a8
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flag.go
View File

@ -645,24 +645,11 @@ func stringifySliceFlag(usage, name string, defaultVals []string) string {
placeholder = defaultPlaceholder placeholder = defaultPlaceholder
} }
nameParts := []string{}
for _, part := range strings.Split(name, ",") {
nameParts = append(nameParts, strings.TrimSpace(part))
}
defaultVal := "" defaultVal := ""
if len(defaultVals) > 0 { if len(defaultVals) > 0 {
defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", ")) defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", "))
} }
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal)) usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal))
return fmt.Sprintf("%s\t%s", prefixedNames(name, placeholder), usageWithDefault)
if len(nameParts) < 2 {
return fmt.Sprintf("%s%s %s\t%s", prefixFor(nameParts[0]), nameParts[0],
placeholder, usageWithDefault)
}
return fmt.Sprintf("%s%s %s, %s%s %s\t%s", prefixFor(nameParts[0]), nameParts[0],
placeholder, prefixFor(nameParts[1]), nameParts[1],
placeholder, usageWithDefault)
} }