go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

Rename Error() to ErrorHandler()

Browse Source 
It is now only used as the error handler that is passed to gocui.Gui on
construction; it's not a client-facing API any more. Also, it doesn't have to
handle gocui.ErrQuit, as gocui takes care of that.
This commit is contained in:
Stefan Haller
2024-04-14 20:25:06 +02:00
parent 653994845e
commit 723b92916d
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/gui.go
View File

@@ -652,7 +652,7 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
gui.g = g
defer gui.g.Close()
g.ErrorHandler = gui.PopupHandler.Error
g.ErrorHandler = gui.PopupHandler.ErrorHandler
// if the deadlock package wants to report a deadlock, we first need to
// close the gui so that we can actually read what it prints.

6
pkg/gui/popup/popup_handler.go
View File

@@ -79,11 +79,7 @@ func (self *PopupHandler) WithWaitingStatusSync(message string, f func() error)
return self.withWaitingStatusSyncFn(message, f)
}
func (self *PopupHandler) Error(err error) error {
if err == gocui.ErrQuit {
return err
}
func (self *PopupHandler) ErrorHandler(err error) error {
return self.ErrorMsg(err.Error())
}

3
pkg/gui/types/common.go
View File

@@ -135,7 +135,8 @@ type IPopupHandler interface {
//
// This is a convenience wrapper around Alert().
ErrorMsg(message string) error
Error(err error) error
// The global error handler for gocui. Not to be used by application code.
ErrorHandler(err error) error
// Shows a notification popup with the given title and message to the user.
//
// This is a convenience wrapper around Confirm(), thus the popup can be closed using both 'Enter' and 'ESC'.