mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename ActivateContext/deactivateContext to Activate/deactivate

Browse source 
"Context" is redundant in the method names here.
This commit is contained in:
Stefan Haller 2024-08-08 10:39:42 +02:00
parent 94d6f4dae7
commit 41f41ee4ee
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/gui/context.go
View file

@ -53,7 +53,7 @@ func (self *ContextMgr) Replace(c types.Context) error {
defer self.Unlock() defer self.Unlock()
return self.ActivateContext(c, types.OnFocusOpts{}) return self.Activate(c, types.OnFocusOpts{})
} }
func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) error { func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) error {
@ -74,7 +74,7 @@ func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) error {
contextsToDeactivate, contextToActivate := self.pushToContextStack(c) contextsToDeactivate, contextToActivate := self.pushToContextStack(c)
for _, contextToDeactivate := range contextsToDeactivate { for _, contextToDeactivate := range contextsToDeactivate {
if err := self.deactivateContext(contextToDeactivate, types.OnFocusLostOpts{NewContextKey: c.GetKey()}); err != nil { if err := self.deactivate(contextToDeactivate, types.OnFocusLostOpts{NewContextKey: c.GetKey()}); err != nil {
return err return err
} }
} }
@ -83,7 +83,7 @@ func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) error {
return nil return nil
} }
return self.ActivateContext(contextToActivate, singleOpts) return self.Activate(contextToActivate, singleOpts)
} }
// Adjusts the context stack based on the context that's being pushed and // Adjusts the context stack based on the context that's being pushed and
@ -160,14 +160,14 @@ func (self *ContextMgr) Pop() error {
self.Unlock() self.Unlock()
if err := self.deactivateContext(currentContext, types.OnFocusLostOpts{NewContextKey: newContext.GetKey()}); err != nil { if err := self.deactivate(currentContext, types.OnFocusLostOpts{NewContextKey: newContext.GetKey()}); err != nil {
return err return err
} }
return self.ActivateContext(newContext, types.OnFocusOpts{}) return self.Activate(newContext, types.OnFocusOpts{})
} }
func (self *ContextMgr) deactivateContext(c types.Context, opts types.OnFocusLostOpts) error { func (self *ContextMgr) deactivate(c types.Context, opts types.OnFocusLostOpts) error {
view, _ := self.gui.c.GocuiGui().View(c.GetViewName()) view, _ := self.gui.c.GocuiGui().View(c.GetViewName())
if opts.NewContextKey != context.SEARCH_CONTEXT_KEY { if opts.NewContextKey != context.SEARCH_CONTEXT_KEY {
@ -190,7 +190,7 @@ func (self *ContextMgr) deactivateContext(c types.Context, opts types.OnFocusLos
return nil return nil
} }
func (self *ContextMgr) ActivateContext(c types.Context, opts types.OnFocusOpts) error { func (self *ContextMgr) Activate(c types.Context, opts types.OnFocusOpts) error {
viewName := c.GetViewName() viewName := c.GetViewName()
v, err := self.gui.c.GocuiGui().View(viewName) v, err := self.gui.c.GocuiGui().View(viewName)
if err != nil { if err != nil {

2
pkg/gui/gui_common.go
View file

@ -54,7 +54,7 @@ func (self *guiCommon) ContextForKey(key types.ContextKey) types.Context {
} }
func (self *guiCommon) ActivateContext(context types.Context) error { func (self *guiCommon) ActivateContext(context types.Context) error {
return self.gui.State.ContextMgr.ActivateContext(context, types.OnFocusOpts{}) return self.gui.State.ContextMgr.Activate(context, types.OnFocusOpts{})
} }
func (self *guiCommon) GetAppState() *config.AppState { func (self *guiCommon) GetAppState() *config.AppState {