sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Remove return value of IContextMgr.Push/Pop et. al.

Browse Source
This commit is contained in:
Stefan Haller
2024-09-04 18:33:48 +02:00
parent 072b465fa6
commit 371998e635
42 changed files with 137 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/gui/controllers/helpers/search_helper.go
View File

@ -41,9 +41,7 @@ func (self *SearchHelper) OpenFilterPrompt(context types.IFilterableContext) err
self.OnPromptContentChanged("")
promptView.RenderTextArea()
if err := self.c.Context().Push(self.c.Contexts().Search); err != nil {
return err
}
self.c.Context().Push(self.c.Contexts().Search)
return self.c.ResetKeybindings()
}
@ -60,9 +58,7 @@ func (self *SearchHelper) OpenSearchPrompt(context types.ISearchableContext) err
promptView.ClearTextArea()
promptView.RenderTextArea()
if err := self.c.Context().Push(self.c.Contexts().Search); err != nil {
return err
}
self.c.Context().Push(self.c.Contexts().Search)
return self.c.ResetKeybindings()
}
@ -115,11 +111,11 @@ func (self *SearchHelper) Confirm() error {
var err error
switch state.SearchType() {
case types.SearchTypeFilter:
err = self.ConfirmFilter()
self.ConfirmFilter()
case types.SearchTypeSearch:
err = self.ConfirmSearch()
case types.SearchTypeNone:
err = self.c.Context().Pop()
self.c.Context().Pop()
}
if err != nil {
@ -129,14 +125,14 @@ func (self *SearchHelper) Confirm() error {
return self.c.ResetKeybindings()
}
func (self *SearchHelper) ConfirmFilter() error {
func (self *SearchHelper) ConfirmFilter() {
// We also do this on each keypress but we do it here again just in case
state := self.searchState()
context, ok := state.Context.(types.IFilterableContext)
if !ok {
self.c.Log.Warnf("Context %s is not filterable", state.Context.GetKey())
return nil
return
}
self.OnPromptContentChanged(self.promptContent())
@ -145,7 +141,7 @@ func (self *SearchHelper) ConfirmFilter() error {
context.GetSearchHistory().Push(filterString)
}
return self.c.Context().Pop()
self.c.Context().Pop()
}
func (self *SearchHelper) ConfirmSearch() error {
@ -163,9 +159,7 @@ func (self *SearchHelper) ConfirmSearch() error {
context.GetSearchHistory().Push(searchString)
}
if err := self.c.Context().Pop(); err != nil {
return err
}
self.c.Context().Pop()
return context.GetView().Search(searchString, modelSearchResults(context))
}
@ -188,9 +182,7 @@ func modelSearchResults(context types.ISearchableContext) []gocui.SearchPosition
func (self *SearchHelper) CancelPrompt() error {
self.Cancel()
if err := self.c.Context().Pop(); err != nil {
return err
}
self.c.Context().Pop()
return self.c.ResetKeybindings()
}