mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-06 01:05:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

kittens: Fix errors not being reported to user when run a UI kitten

Browse Source 
Fixes #6403
This commit is contained in:
Kovid Goyal
2023-06-29 07:36:24 +05:30
parent e81a40255b
commit ab10070ee8
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/cli/command.go
View File

@@ -39,6 +39,8 @@ type Command struct {
IgnoreAllArgs bool
// Specialised arg parsing
ParseArgsForCompletion func(cmd *Command, args []string, completions *Completions)
// Callback that is called on error
CallbackOnError func(cmd *Command, err error, during_parsing bool, exit_code int) (final_exit_code int)
SubCommandGroups []*CommandGroup
OptionGroups []*OptionGroup
@@ -529,6 +531,9 @@ func (self *Command) ExecArgs(args []string) (exit_code int) {
}
cmd, err := root.ParseArgs(args)
if err != nil {
if self.CallbackOnError != nil {
return self.CallbackOnError(cmd, err, true, 1)
}
ShowError(err)
return 1
}
@@ -543,10 +548,13 @@ func (self *Command) ExecArgs(args []string) (exit_code int) {
} else if cmd.Run != nil {
exit_code, err = cmd.Run(cmd, cmd.Args)
if err != nil {
ShowError(err)
if exit_code == 0 {
exit_code = 1
}
if self.CallbackOnError != nil {
return self.CallbackOnError(cmd, err, false, exit_code)
}
ShowError(err)
}
}
return