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

Replace CurrentContext() with Context().Current()

Browse source
This commit is contained in:
Stefan Haller 2024-08-08 10:26:55 +02:00
parent 8e15451117
commit 7ed94c0410
23 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/gui/context/local_commits_context.go
View file

@ -34,7 +34,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
getDisplayStrings := func(startIdx int, endIdx int) [][]string { getDisplayStrings := func(startIdx int, endIdx int) [][]string {
selectedCommitHash := "" selectedCommitHash := ""
if c.CurrentContext().GetKey() == LOCAL_COMMITS_CONTEXT_KEY { if c.Context().Current().GetKey() == LOCAL_COMMITS_CONTEXT_KEY {
selectedCommit := viewModel.GetSelected() selectedCommit := viewModel.GetSelected()
if selectedCommit != nil { if selectedCommit != nil {
selectedCommitHash = selectedCommit.Hash selectedCommitHash = selectedCommit.Hash

2
pkg/gui/context/sub_commits_context.go
View file

@ -47,7 +47,7 @@ func NewSubCommitsContext(
} }
selectedCommitHash := "" selectedCommitHash := ""
if c.CurrentContext().GetKey() == SUB_COMMITS_CONTEXT_KEY { if c.Context().Current().GetKey() == SUB_COMMITS_CONTEXT_KEY {
selectedCommit := viewModel.GetSelected() selectedCommit := viewModel.GetSelected()
if selectedCommit != nil { if selectedCommit != nil {
selectedCommitHash = selectedCommit.Hash selectedCommitHash = selectedCommit.Hash

2
pkg/gui/controllers/commits_files_controller.go
View file

@ -178,7 +178,7 @@ func (self *CommitFilesController) checkout(node *filetree.CommitFileNode) error
} }
func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileNode) error { func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileNode) error {
parentContext, ok := self.c.CurrentContext().GetParentContext() parentContext, ok := self.c.Context().Current().GetParentContext()
if !ok || parentContext.GetKey() != context.LOCAL_COMMITS_CONTEXT_KEY { if !ok || parentContext.GetKey() != context.LOCAL_COMMITS_CONTEXT_KEY {
return errors.New(self.c.Tr.CanOnlyDiscardFromLocalCommits) return errors.New(self.c.Tr.CanOnlyDiscardFromLocalCommits)
} }

4
pkg/gui/controllers/custom_patch_options_menu_action.go
View file

@ -66,7 +66,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
}, },
}...) }...)
if self.c.CurrentContext().GetKey() == self.c.Contexts().LocalCommits.GetKey() { if self.c.Context().Current().GetKey() == self.c.Contexts().LocalCommits.GetKey() {
selectedCommit := self.c.Contexts().LocalCommits.GetSelected() selectedCommit := self.c.Contexts().LocalCommits.GetSelected()
if selectedCommit != nil && self.c.Git().Patch.PatchBuilder.To != selectedCommit.Hash { if selectedCommit != nil && self.c.Git().Patch.PatchBuilder.To != selectedCommit.Hash {
@ -122,7 +122,7 @@ func (self *CustomPatchOptionsMenuAction) validateNormalWorkingTreeState() (bool
} }
func (self *CustomPatchOptionsMenuAction) returnFocusFromPatchExplorerIfNecessary() error { func (self *CustomPatchOptionsMenuAction) returnFocusFromPatchExplorerIfNecessary() error {
if self.c.CurrentContext().GetKey() == self.c.Contexts().CustomPatchBuilder.GetKey() { if self.c.Context().Current().GetKey() == self.c.Contexts().CustomPatchBuilder.GetKey() {
return self.c.Helpers().PatchBuilding.Escape() return self.c.Helpers().PatchBuilding.Escape()
} }
return nil return nil

2
pkg/gui/controllers/helpers/confirmation_helper.go
View file

@ -431,7 +431,7 @@ func (self *ConfirmationHelper) IsPopupPanel(context types.Context) bool {
} }
func (self *ConfirmationHelper) IsPopupPanelFocused() bool { func (self *ConfirmationHelper) IsPopupPanelFocused() bool {
return self.IsPopupPanel(self.c.CurrentContext()) return self.IsPopupPanel(self.c.Context().Current())
} }
func (self *ConfirmationHelper) TooltipForMenuItem(menuItem *types.MenuItem) string { func (self *ConfirmationHelper) TooltipForMenuItem(menuItem *types.MenuItem) string {

2
pkg/gui/controllers/helpers/diff_helper.go
View file

@ -93,7 +93,7 @@ func (self *DiffHelper) currentDiffTerminal() string {
} }
func (self *DiffHelper) currentlySelectedFilename() string { func (self *DiffHelper) currentlySelectedFilename() string {
currentContext := self.c.CurrentContext() currentContext := self.c.Context().Current()
switch currentContext := currentContext.(type) { switch currentContext := currentContext.(type) {
case types.IListContext: case types.IListContext:

2
pkg/gui/controllers/helpers/merge_conflicts_helper.go
View file

@ -123,7 +123,7 @@ func (self *MergeConflictsHelper) RefreshMergeState() error {
self.c.Contexts().MergeConflicts.GetMutex().Lock() self.c.Contexts().MergeConflicts.GetMutex().Lock()
defer self.c.Contexts().MergeConflicts.GetMutex().Unlock() defer self.c.Contexts().MergeConflicts.GetMutex().Unlock()
if self.c.CurrentContext().GetKey() != context.MERGE_CONFLICTS_CONTEXT_KEY { if self.c.Context().Current().GetKey() != context.MERGE_CONFLICTS_CONTEXT_KEY {
return nil return nil
} }

2
pkg/gui/controllers/helpers/patch_building_helper.go
View file

@ -54,7 +54,7 @@ func (self *PatchBuildingHelper) Reset() error {
} }
// refreshing the current context so that the secondary panel is hidden if necessary. // refreshing the current context so that the secondary panel is hidden if necessary.
return self.c.PostRefreshUpdate(self.c.CurrentContext()) return self.c.PostRefreshUpdate(self.c.Context().Current())
} }
func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpts) error { func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpts) error {

4
pkg/gui/controllers/helpers/refs_helper.go
View file

@ -109,7 +109,7 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN
checkout := func(branchName string) error { checkout := func(branchName string) error {
// Switch to the branches context _before_ starting to check out the // Switch to the branches context _before_ starting to check out the
// branch, so that we see the inline status // branch, so that we see the inline status
if self.c.CurrentContext() != self.c.Contexts().Branches { if self.c.Context().Current() != self.c.Contexts().Branches {
if err := self.c.Context().Push(self.c.Contexts().Branches); err != nil { if err := self.c.Context().Push(self.c.Contexts().Branches); err != nil {
return err return err
} }
@ -292,7 +292,7 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
return err return err
} }
if self.c.CurrentContext() != self.c.Contexts().Branches { if self.c.Context().Current() != self.c.Contexts().Branches {
if err := self.c.Context().Push(self.c.Contexts().Branches); err != nil { if err := self.c.Context().Push(self.c.Contexts().Branches); err != nil {
return err return err
} }

2
pkg/gui/controllers/helpers/search_helper.go
View file

@ -262,7 +262,7 @@ func (self *SearchHelper) ReApplySearch(ctx types.Context) {
if ctx == state.Context { if ctx == state.Context {
// Re-render the "x of y" search status, unless the search prompt is // Re-render the "x of y" search status, unless the search prompt is
// open for typing. // open for typing.
if self.c.CurrentContext().GetKey() != context.SEARCH_CONTEXT_KEY { if self.c.Context().Current().GetKey() != context.SEARCH_CONTEXT_KEY {
self.RenderSearchStatus(searchableContext) self.RenderSearchStatus(searchableContext)
} }
} }

2
pkg/gui/controllers/helpers/window_helper.go
View file

@ -61,7 +61,7 @@ func (self *WindowHelper) windowViewNameMap() *utils.ThreadSafeMap[string, strin
} }
func (self *WindowHelper) CurrentWindow() string { func (self *WindowHelper) CurrentWindow() string {
return self.c.CurrentContext().GetWindowName() return self.c.Context().Current().GetWindowName()
} }
// assumes the context's windowName has been set to the new window if necessary // assumes the context's windowName has been set to the new window if necessary

2
pkg/gui/controllers/list_controller.go
View file

@ -185,7 +185,7 @@ func (self *ListController) pushContextIfNotFocused() error {
} }
func (self *ListController) isFocused() bool { func (self *ListController) isFocused() bool {
return self.c.CurrentContext().GetKey() == self.context.GetKey() return self.c.Context().Current().GetKey() == self.context.GetKey()
} }
func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {

2
pkg/gui/controllers/options_menu_action.go
View file

@ -12,7 +12,7 @@ type OptionsMenuAction struct {
} }
func (self *OptionsMenuAction) Call() error { func (self *OptionsMenuAction) Call() error {
ctx := self.c.CurrentContext() ctx := self.c.Context().Current()
// Don't show menu while displaying popup. // Don't show menu while displaying popup.
if ctx.GetKind() == types.PERSISTENT_POPUP || ctx.GetKind() == types.TEMPORARY_POPUP { if ctx.GetKind() == types.PERSISTENT_POPUP || ctx.GetKind() == types.TEMPORARY_POPUP {
return nil return nil

2
pkg/gui/controllers/patch_explorer_controller.go
View file

@ -293,7 +293,7 @@ func (self *PatchExplorerController) CopySelectedToClipboard() error {
} }
func (self *PatchExplorerController) isFocused() bool { func (self *PatchExplorerController) isFocused() bool {
return self.c.CurrentContext().GetKey() == self.context.GetKey() return self.c.Context().Current().GetKey() == self.context.GetKey()
} }
func (self *PatchExplorerController) withRenderAndFocus(f func() error) func() error { func (self *PatchExplorerController) withRenderAndFocus(f func() error) func() error {

2
pkg/gui/controllers/quit_actions.go
View file

@ -49,7 +49,7 @@ func (self *QuitActions) confirmQuitDuringUpdate() error {
} }
func (self *QuitActions) Escape() error { func (self *QuitActions) Escape() error {
currentContext := self.c.CurrentContext() currentContext := self.c.Context().Current()
if listContext, ok := currentContext.(types.IListContext); ok { if listContext, ok := currentContext.(types.IListContext); ok {
if listContext.GetList().IsSelectingRange() { if listContext.GetList().IsSelectingRange() {

2
pkg/gui/controllers/toggle_whitespace_action.go
View file

@ -19,7 +19,7 @@ func (self *ToggleWhitespaceAction) Call() error {
context.PATCH_BUILDING_MAIN_CONTEXT_KEY, context.PATCH_BUILDING_MAIN_CONTEXT_KEY,
} }
if lo.Contains(contextsThatDontSupportIgnoringWhitespace, self.c.CurrentContext().GetKey()) { if lo.Contains(contextsThatDontSupportIgnoringWhitespace, self.c.Context().Current().GetKey()) {
// Ignoring whitespace is not supported in these views. Let the user // Ignoring whitespace is not supported in these views. Let the user
// know that it's not going to work in case they try to turn it on. // know that it's not going to work in case they try to turn it on.
return errors.New(self.c.Tr.IgnoreWhitespaceNotSupportedHere) return errors.New(self.c.Tr.IgnoreWhitespaceNotSupportedHere)

4
pkg/gui/global_handlers.go
View file

@ -27,7 +27,7 @@ func (gui *Gui) scrollDownView(view *gocui.View) {
func (gui *Gui) scrollUpMain() error { func (gui *Gui) scrollUpMain() error {
var view *gocui.View var view *gocui.View
if gui.c.CurrentContext().GetWindowName() == "secondary" { if gui.c.Context().Current().GetWindowName() == "secondary" {
view = gui.secondaryView() view = gui.secondaryView()
} else { } else {
view = gui.mainView() view = gui.mainView()
@ -48,7 +48,7 @@ func (gui *Gui) scrollUpMain() error {
func (gui *Gui) scrollDownMain() error { func (gui *Gui) scrollDownMain() error {
var view *gocui.View var view *gocui.View
if gui.c.CurrentContext().GetWindowName() == "secondary" { if gui.c.Context().Current().GetWindowName() == "secondary" {
view = gui.secondaryView() view = gui.secondaryView()
} else { } else {
view = gui.mainView() view = gui.mainView()

2
pkg/gui/gui.go
View file

@ -360,7 +360,7 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context {
gui.State.CurrentPopupOpts = nil gui.State.CurrentPopupOpts = nil
gui.Mutexes.PopupMutex.Unlock() gui.Mutexes.PopupMutex.Unlock()
return gui.c.CurrentContext() return gui.c.Context().Current()
} }
contextTree := gui.contextTree() contextTree := gui.contextTree()

4
pkg/gui/gui_common.go
View file

@ -45,10 +45,6 @@ func (self *guiCommon) RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error) {
return self.gui.runSubprocessWithSuspense(cmdObj) return self.gui.runSubprocessWithSuspense(cmdObj)
} }
func (self *guiCommon) CurrentContext() types.Context {
return self.gui.State.ContextMgr.Current()
}
func (self *guiCommon) CurrentStaticContext() types.Context { func (self *guiCommon) CurrentStaticContext() types.Context {
return self.gui.State.ContextMgr.CurrentStatic() return self.gui.State.ContextMgr.CurrentStatic()
} }

2
pkg/gui/gui_driver.go
View file

@ -75,7 +75,7 @@ func (self *GuiDriver) Keys() config.KeybindingConfig {
} }
func (self *GuiDriver) CurrentContext() types.Context { func (self *GuiDriver) CurrentContext() types.Context {
return self.gui.c.CurrentContext() return self.gui.c.Context().Current()
} }
func (self *GuiDriver) ContextForView(viewName string) types.Context { func (self *GuiDriver) ContextForView(viewName string) types.Context {

2
pkg/gui/layout.go
View file

@ -211,7 +211,7 @@ func (gui *Gui) onInitialViewsCreationForRepo() error {
} }
} }
initialContext := gui.c.CurrentContext() initialContext := gui.c.Context().Current()
if err := gui.c.ActivateContext(initialContext); err != nil { if err := gui.c.ActivateContext(initialContext); err != nil {
return err return err
} }

2
pkg/gui/options_map.go
View file

@ -33,7 +33,7 @@ func (gui *Gui) renderContextOptionsMap() {
// to want to press that key. For example, when in cherry-picking mode, we // to want to press that key. For example, when in cherry-picking mode, we
// want to prominently show the keybinding for pasting commits. // want to prominently show the keybinding for pasting commits.
func (self *OptionsMapMgr) renderContextOptionsMap() { func (self *OptionsMapMgr) renderContextOptionsMap() {
currentContext := self.c.CurrentContext() currentContext := self.c.Context().Current()
currentContextBindings := currentContext.GetKeybindings(self.c.KeybindingsOpts()) currentContextBindings := currentContext.GetKeybindings(self.c.KeybindingsOpts())
globalBindings := self.c.Contexts().Global.GetKeybindings(self.c.KeybindingsOpts()) globalBindings := self.c.Contexts().Global.GetKeybindings(self.c.KeybindingsOpts())

1
pkg/gui/types/common.go
View file

@ -57,7 +57,6 @@ type IGuiCommon interface {
RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error) RunSubprocess(cmdObj oscommands.ICmdObj) (bool, error)
RunSubprocessAndRefresh(oscommands.ICmdObj) error RunSubprocessAndRefresh(oscommands.ICmdObj) error
CurrentContext() Context
CurrentStaticContext() Context CurrentStaticContext() Context
CurrentSideContext() Context CurrentSideContext() Context
CurrentPopupContexts() []Context CurrentPopupContexts() []Context