mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove calls to Error()

Browse source 
Now that we have an error handler set, we can simply let them bubble up all the
way to gocui.
This commit is contained in:
Stefan Haller 2024-04-11 21:57:13 +02:00
parent 325800a72e
commit 82a3d33ce3
35 changed files with 158 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/gui/services/custom_commands/handler_creator.go
View file

@ -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 {