mirror
/
cobra
mirror of https://github.com/spf13/cobra.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix completion command: use PersistentPreRunE instead of PersistentPreRun

This commit is contained in:
Jun Nishimura 2023-07-14 23:50:49 +09:00
parent b370e7b9af
commit 46a2ba8c41
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
completions.go
View File

@ -681,7 +681,7 @@ See each sub-command's help for details on how to use the generated script.
ValidArgsFunction: NoFileCompletions, ValidArgsFunction: NoFileCompletions,
Hidden: c.CompletionOptions.HiddenDefaultCmd, Hidden: c.CompletionOptions.HiddenDefaultCmd,
GroupID: c.completionCommandGroupID, GroupID: c.completionCommandGroupID,
PersistentPreRun: func(cmd *Command, args []string) { PersistentPreRunE: func(cmd *Command, args []string) error {
cmd.Flags().VisitAll(func(flag *pflag.Flag) { cmd.Flags().VisitAll(func(flag *pflag.Flag) {
requiredAnnotation, found := flag.Annotations[BashCompOneRequiredFlag] requiredAnnotation, found := flag.Annotations[BashCompOneRequiredFlag]
if found && requiredAnnotation[0] == "true" { if found && requiredAnnotation[0] == "true" {
@ -691,7 +691,12 @@ See each sub-command's help for details on how to use the generated script.
}) })
// Adding PersistentPreRun on sub-commands prevents root's PersistentPreRun from being called. // Adding PersistentPreRun on sub-commands prevents root's PersistentPreRun from being called.
// So it is intentionally called here. // So it is intentionally called here.
cmd.Root().PersistentPreRun(cmd.Root(), args) if cmd.Root().PersistentPreRunE != nil {
return cmd.Root().PersistentPreRunE(cmd, args)
} else if cmd.Root().PersistentPreRun != nil {
cmd.Root().PersistentPreRun(cmd, args)
}
return nil
}, },
} }
c.AddCommand(completionCmd) c.AddCommand(completionCmd)