diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-04-11 21:57:13 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-04-18 10:10:30 +0200 |
| commit | 82a3d33ce3e089bc103ec09b33b3ed7f47ac1381 (patch) | |
| tree | 368db22e05cc8d25a49c6493f3c6e8e023742a00 /pkg/gui/services/custom_commands | |
| parent | 325800a72e166d6c43ecb78247ae6e05ad9624ca (diff) | |
Remove calls to Error()
Now that we have an error handler set, we can simply let them bubble up all the
way to gocui.
Diffstat (limited to 'pkg/gui/services/custom_commands')
| -rw-r--r-- | pkg/gui/services/custom_commands/handler_creator.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/gui/services/custom_commands/handler_creator.go b/pkg/gui/services/custom_commands/handler_creator.go index d5dec287f..4d4fb896f 100644 --- a/pkg/gui/services/custom_commands/handler_creator.go +++ b/pkg/gui/services/custom_commands/handler_creator.go @@ -74,7 +74,7 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro f = func() error { resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate) if err != nil { - return self.c.Error(err) + return err } return self.inputPrompt(resolvedPrompt, wrappedF) } @@ -82,7 +82,7 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro f = func() error { resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate) if err != nil { - return self.c.Error(err) + return err } return self.menuPrompt(resolvedPrompt, wrappedF) } @@ -90,7 +90,7 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro f = func() error { resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate) if err != nil { - return self.c.Error(err) + return err } return self.menuPromptFromCommand(resolvedPrompt, wrappedF) } @@ -98,7 +98,7 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro f = func() error { resolvedPrompt, err := self.resolver.resolvePrompt(&prompt, resolveTemplate) if err != nil { - return self.c.Error(err) + return err } return self.confirmPrompt(resolvedPrompt, g) } @@ -114,7 +114,7 @@ func (self *HandlerCreator) call(customCommand config.CustomCommand) func() erro func (self *HandlerCreator) inputPrompt(prompt *config.CustomCommandPrompt, wrappedF func(string) error) error { findSuggestionsFn, err := self.generateFindSuggestionsFunc(prompt) if err != nil { - return self.c.Error(err) + return err } return self.c.Prompt(types.PromptOpts{ @@ -208,13 +208,13 @@ func (self *HandlerCreator) menuPromptFromCommand(prompt *config.CustomCommandPr // Run and save output message, err := self.c.Git().Custom.RunWithOutput(prompt.Command) if err != nil { - return self.c.Error(err) + return err } // Need to make a menu out of what the cmd has displayed candidates, err := self.menuGenerator.call(message, prompt.Filter, prompt.ValueFormat, prompt.LabelFormat) if err != nil { - return self.c.Error(err) + return err } menuItems := lo.Map(candidates, func(candidate *commandMenuItem, _ int) *types.MenuItem { @@ -253,7 +253,7 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses resolveTemplate := self.getResolveTemplateFn(form, promptResponses, sessionState) cmdStr, err := resolveTemplate(customCommand.Command) if err != nil { - return self.c.Error(err) + return err } cmdObj := self.c.OS().Cmd.NewShell(cmdStr) @@ -284,7 +284,7 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses return self.mergeAndRebaseHelper.CheckForConflicts(err) } - return self.c.Error(err) + return err } if customCommand.ShowOutput { |