Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#52) improve handling of duplicate command errors #53

Merged
merged 1 commit into from
Aug 25, 2024
Merged

(#52) improve handling of duplicate command errors #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ func (a *Application) MustParseWithUsage(args []string) (command string) {
fmt.Fprintf(a.errorWriter, "error: %v, use --help for full help including flags and arguments\n\n", err)
ut = a.errorUsageTemplate

case errorIs(err, ErrRequiredArgument, ErrRequiredFlag, ErrUnknownLongFlag, ErrUnknownShortFlag, ErrExpectedFlagArgument, ErrFlagCannotRepeat, ErrUnexpectedArgument):
case errorIs(err, ErrRequiredArgument, ErrRequiredFlag, ErrUnknownLongFlag, ErrUnknownShortFlag, ErrExpectedFlagArgument, ErrFlagCannotRepeat, ErrUnexpectedArgument, ErrDuplicateCommand):
fmt.Fprintf(a.errorWriter, "error: %v\n\n", err)

default:
Expand Down
2 changes: 1 addition & 1 deletion cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (c *cmdGroup) init() error {
defaults = append(defaults, cmd.name)
}
if seen[cmd.name] {
return fmt.Errorf("duplicate command %q", cmd.name)
return fmt.Errorf("%w %q", ErrDuplicateCommand, cmd.name)
}
seen[cmd.name] = true
for _, alias := range cmd.aliases {
Expand Down
3 changes: 3 additions & 0 deletions errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ var (

// ErrUnexpectedArgument indicates an unexpected argument was encountered
ErrUnexpectedArgument = errors.New("unexpected argument")

// ErrDuplicateCommand indicates that a command was defined multiple times
ErrDuplicateCommand = errors.New("duplicate command")
)
Loading