Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,21 +279,38 @@ func Run(ctx context.Context, root *Command, options *RunOptions) error {
// }
func ParseAndRun(ctx context.Context, root *Command, args []string, options *RunOptions) error {
if err := Parse(root, args); err != nil {
if errors.Is(err, flag.ErrHelp) {
options = checkAndSetRunOptions(options)
_, _ = fmt.Fprintln(options.Stdout, help(root))
return nil
}
if usageErr, ok := errors.AsType[*usageError](err); ok {
options = checkAndSetRunOptions(options)
_, _ = fmt.Fprintf(options.Stderr, "%s\n\n", help(root))
return usageErr.Unwrap()
}
return err
return HandleErrHelp(err, root, options)
}
return Run(ctx, root, options)
}

// HandleErrHelp handles ErrHelp/usageError by printing the help.
//
// If the has been handled like that, then it returns nil.
// For other errors, err is returned.
func HandleErrHelp(err error, root *Command, options *RunOptions) error {
if errors.Is(err, flag.ErrHelp) {
options = checkAndSetRunOptions(options)
PrintHelp(options.Stdout, root)
return nil
}
if usageErr, ok := errors.AsType[*usageError](err); ok {
options = checkAndSetRunOptions(options)
PrintHelp(options.Stderr, root)
_, _ = options.Stderr.Write([]byte{'\n'})
return usageErr.Unwrap()
}
return err
}

// PrintHelp prints the help message to the given writer (os.Stderr if nil).
func PrintHelp(w io.Writer, root *Command) {
if w == nil {
w = os.Stderr
}
_, _ = fmt.Fprintln(w, help(root))
}

// UsageErrorf returns an error for invalid command arguments or flag combinations. [Run] prints the
// command's help before returning the underlying error.
//
Expand Down
Loading