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

Remove return value of CreatePopupPanel

Browse Source
This commit is contained in:
Stefan Haller 2024-09-05 10:40:59 +02:00
parent 6f0182f11c
commit b15a1c7ae7
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/controllers/helpers/confirmation_helper.go
View File

@ -183,7 +183,7 @@ func runeForMask(mask bool) rune {
return 0
}
func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) error {
func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts types.CreatePopupPanelOpts) {
self.c.Mutexes().PopupMutex.Lock()
defer self.c.Mutexes().PopupMutex.Unlock()
@ -197,7 +197,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
if currentPopupOpts != nil && !currentPopupOpts.HasLoader {
self.c.Log.Error("ignoring create popup panel because a popup panel is already open")
cancel()
return nil
return
}
// remove any previous keybindings
@ -231,7 +231,6 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
self.c.State().GetRepoState().SetCurrentPopupOpts(&opts)
self.c.Context().Push(self.c.Contexts().Confirmation)
return nil
}
func underlineLinks(text string) string {

4
pkg/gui/gui.go
View File

@ -671,8 +671,8 @@ func NewGui(
gui.PopupHandler = popup.NewPopupHandler(
cmn,
func(ctx goContext.Context, opts types.CreatePopupPanelOpts) error {
return gui.helpers.Confirmation.CreatePopupPanel(ctx, opts)
func(ctx goContext.Context, opts types.CreatePopupPanelOpts) {
gui.helpers.Confirmation.CreatePopupPanel(ctx, opts)
},
func() error { return gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) },
func() { gui.State.ContextMgr.Pop() },

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

@ -12,7 +12,7 @@ import (
type PopupHandler struct {
*common.Common
createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts) error
createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts)
onErrorFn func() error
popContextFn func()
currentContextFn func() types.Context
@ -28,7 +28,7 @@ var _ types.IPopupHandler = &PopupHandler{}
func NewPopupHandler(
common *common.Common,
createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts) error,
createPopupPanelFn func(context.Context, types.CreatePopupPanelOpts),
onErrorFn func() error,
popContextFn func(),
currentContextFn func() types.Context,
@ -94,16 +94,17 @@ func (self *PopupHandler) Alert(title string, message string) error {
}
func (self *PopupHandler) Confirm(opts types.ConfirmOpts) error {
return self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
Title: opts.Title,
Prompt: opts.Prompt,
HandleConfirm: opts.HandleConfirm,
HandleClose: opts.HandleClose,
})
return nil
}
func (self *PopupHandler) Prompt(opts types.PromptOpts) error {
return self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
Title: opts.Title,
Prompt: opts.InitialContent,
Editable: true,
@ -114,6 +115,7 @@ func (self *PopupHandler) Prompt(opts types.PromptOpts) error {
AllowEditSuggestion: opts.AllowEditSuggestion,
Mask: opts.Mask,
})
return nil
}
// returns the content that has currently been typed into the prompt. Useful for