glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-07 22:07:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix default suggestions template for multiple suggestions

Browse source
This commit is contained in:
John Brunton 2020-06-25 13:35:13 +01:00
parent eb5c65715d
commit 410e43b3fe
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
command.go
View file

@ -546,8 +546,7 @@ func (c *Command) SuggestionsTemplate() string {
return ` return `
Did you mean this? Did you mean this?
{{range .}}{{print "\t" .}}{{end}} {{range .}}{{print "\t" . "\n"}}{{end}}`
`
} }
func hasNoOptDefVal(name string, fs *flag.FlagSet) bool { func hasNoOptDefVal(name string, fs *flag.FlagSet) bool {

26
command_test.go
View file

@ -1205,9 +1205,8 @@ func TestSuggestions(t *testing.T) {
func TestSuggestionsTemplate(t *testing.T) { func TestSuggestionsTemplate(t *testing.T) {
rootCmd := &Command{Use: "root", Run: emptyRun} rootCmd := &Command{Use: "root", Run: emptyRun}
timesCmd := &Command{ timesCmd := &Command{
Use: "times", Use: "times",
SuggestFor: []string{"counts"}, Run: emptyRun,
Run: emptyRun,
} }
rootCmd.AddCommand(timesCmd) rootCmd.AddCommand(timesCmd)
rootCmd.SetSuggestionsTemplate(` rootCmd.SetSuggestionsTemplate(`
@ -1221,6 +1220,27 @@ customized suggestions: {{range .}}{{.}}{{end}}`)
} }
} }
func TestDefaultSuggestionsTemplateMultiLine(t *testing.T) {
rootCmd := &Command{Use: "root", Run: emptyRun}
timeCmd := &Command{
Use: "time",
Run: emptyRun,
}
rootCmd.AddCommand(timeCmd)
timesCmd := &Command{
Use: "times",
Run: emptyRun,
}
rootCmd.AddCommand(timesCmd)
output, _ := executeCommand(rootCmd, "tim")
expected := "Error: unknown command \"tim\" for \"root\"\n\nDid you mean this?\n\ttime\n\ttimes\n\nRun 'root --help' for usage.\n"
if output != expected {
t.Errorf("Unexpected response.\nExpected:\n %q\nGot:\n %q\n", expected, output)
}
}
func TestRemoveCommand(t *testing.T) { func TestRemoveCommand(t *testing.T) {
rootCmd := &Command{Use: "root", Args: NoArgs, Run: emptyRun} rootCmd := &Command{Use: "root", Args: NoArgs, Run: emptyRun}
childCmd := &Command{Use: "child", Run: emptyRun} childCmd := &Command{Use: "child", Run: emptyRun}