go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

Replace CurrentStaticContext() with Context().CurrentStatic()

Browse Source
This commit is contained in:
Stefan Haller 2024-08-08 10:28:34 +02:00
parent 7ed94c0410
commit 7f935c1ea8
9 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/context_lines_controller.go
View File

@ -94,7 +94,7 @@ func (self *ContextLinesController) applyChange() error {
self.c.Toast(fmt.Sprintf(self.c.Tr.DiffContextSizeChanged, self.c.AppState.DiffContextSize)) self.c.Toast(fmt.Sprintf(self.c.Tr.DiffContextSizeChanged, self.c.AppState.DiffContextSize))
self.c.SaveAppStateAndLogError() self.c.SaveAppStateAndLogError()
currentContext := self.c.CurrentStaticContext() currentContext := self.c.Context().CurrentStatic()
switch currentContext.GetKey() { switch currentContext.GetKey() {
// we make an exception for our staging and patch building contexts because they actually need to refresh their state afterwards. // we make an exception for our staging and patch building contexts because they actually need to refresh their state afterwards.
case context.PATCH_BUILDING_MAIN_CONTEXT_KEY: case context.PATCH_BUILDING_MAIN_CONTEXT_KEY:
@ -117,6 +117,6 @@ func (self *ContextLinesController) checkCanChangeContext() error {
func (self *ContextLinesController) isShowingDiff() bool { func (self *ContextLinesController) isShowingDiff() bool {
return lo.Contains( return lo.Contains(
CONTEXT_KEYS_SHOWING_DIFFS, CONTEXT_KEYS_SHOWING_DIFFS,
self.c.CurrentStaticContext().GetKey(), self.c.Context().CurrentStatic().GetKey(),
) )
} }

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

@ -41,7 +41,7 @@ func (self *PatchBuildingHelper) Escape() error {
func (self *PatchBuildingHelper) Reset() error { func (self *PatchBuildingHelper) Reset() error {
self.c.Git().Patch.PatchBuilder.Reset() self.c.Git().Patch.PatchBuilder.Reset()
if self.c.CurrentStaticContext().GetKind() != types.SIDE_CONTEXT { if self.c.Context().CurrentStatic().GetKind() != types.SIDE_CONTEXT {
if err := self.Escape(); err != nil { if err := self.Escape(); err != nil {
return err return err
} }

4
pkg/gui/controllers/helpers/staging_helper.go
View File

@ -114,9 +114,9 @@ func (self *StagingHelper) handleStagingEscape() error {
} }
func (self *StagingHelper) secondaryStagingFocused() bool { func (self *StagingHelper) secondaryStagingFocused() bool {
return self.c.CurrentStaticContext().GetKey() == self.c.Contexts().StagingSecondary.GetKey() return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().StagingSecondary.GetKey()
} }
func (self *StagingHelper) mainStagingFocused() bool { func (self *StagingHelper) mainStagingFocused() bool {
return self.c.CurrentStaticContext().GetKey() == self.c.Contexts().Staging.GetKey() return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().Staging.GetKey()
} }

2
pkg/gui/controllers/helpers/window_arrangement_helper.go
View File

@ -90,7 +90,7 @@ func (self *WindowArrangementHelper) GetWindowDimensions(informationStr string,
UserConfig: self.c.UserConfig, UserConfig: self.c.UserConfig,
CurrentWindow: self.windowHelper.CurrentWindow(), CurrentWindow: self.windowHelper.CurrentWindow(),
CurrentSideWindow: self.c.CurrentSideContext().GetWindowName(), CurrentSideWindow: self.c.CurrentSideContext().GetWindowName(),
CurrentStaticWindow: self.c.CurrentStaticContext().GetWindowName(), CurrentStaticWindow: self.c.Context().CurrentStatic().GetWindowName(),
SplitMainPanel: repoState.GetSplitMainPanel(), SplitMainPanel: repoState.GetSplitMainPanel(),
ScreenMode: repoState.GetScreenMode(), ScreenMode: repoState.GetScreenMode(),
AppStatus: appStatus, AppStatus: appStatus,

4
pkg/gui/controllers/rename_similarity_threshold_controller.go
View File

@ -82,7 +82,7 @@ func (self *RenameSimilarityThresholdController) applyChange() error {
self.c.Toast(fmt.Sprintf(self.c.Tr.RenameSimilarityThresholdChanged, self.c.AppState.RenameSimilarityThreshold)) self.c.Toast(fmt.Sprintf(self.c.Tr.RenameSimilarityThresholdChanged, self.c.AppState.RenameSimilarityThreshold))
self.c.SaveAppStateAndLogError() self.c.SaveAppStateAndLogError()
currentContext := self.c.CurrentStaticContext() currentContext := self.c.Context().CurrentStatic()
switch currentContext.GetKey() { switch currentContext.GetKey() {
// we make an exception for our files context, because it actually need to refresh its state afterwards. // we make an exception for our files context, because it actually need to refresh its state afterwards.
case context.FILES_CONTEXT_KEY: case context.FILES_CONTEXT_KEY:
@ -95,6 +95,6 @@ func (self *RenameSimilarityThresholdController) applyChange() error {
func (self *RenameSimilarityThresholdController) isShowingRenames() bool { func (self *RenameSimilarityThresholdController) isShowingRenames() bool {
return lo.Contains( return lo.Contains(
CONTEXT_KEYS_SHOWING_RENAMES, CONTEXT_KEYS_SHOWING_RENAMES,
self.c.CurrentStaticContext().GetKey(), self.c.Context().CurrentStatic().GetKey(),
) )
} }

2
pkg/gui/extras_panel.go
View File

@ -15,7 +15,7 @@ func (gui *Gui) handleCreateExtrasMenuPanel() error {
{ {
Label: gui.c.Tr.ToggleShowCommandLog, Label: gui.c.Tr.ToggleShowCommandLog,
OnPress: func() error { OnPress: func() error {
currentContext := gui.c.CurrentStaticContext() currentContext := gui.c.Context().CurrentStatic()
if gui.c.State().GetShowExtrasWindow() && currentContext.GetKey() == context.COMMAND_LOG_CONTEXT_KEY { if gui.c.State().GetShowExtrasWindow() && currentContext.GetKey() == context.COMMAND_LOG_CONTEXT_KEY {
if err := gui.c.Context().Pop(); err != nil { if err := gui.c.Context().Pop(); err != nil {
return err return err

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) CurrentStaticContext() types.Context {
return self.gui.State.ContextMgr.CurrentStatic()
}
func (self *guiCommon) CurrentSideContext() types.Context { func (self *guiCommon) CurrentSideContext() types.Context {
return self.gui.State.ContextMgr.CurrentSide() return self.gui.State.ContextMgr.CurrentSide()
} }

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
CurrentStaticContext() Context
CurrentSideContext() Context CurrentSideContext() Context
CurrentPopupContexts() []Context CurrentPopupContexts() []Context
IsCurrentContext(Context) bool IsCurrentContext(Context) bool

2
pkg/gui/view_helpers.go
View File

@ -119,7 +119,7 @@ func (gui *Gui) handlePrevTab() error {
func getTabbedView(gui *Gui) *gocui.View { func getTabbedView(gui *Gui) *gocui.View {
// It safe assumption that only static contexts have tabs // It safe assumption that only static contexts have tabs
context := gui.c.CurrentStaticContext() context := gui.c.Context().CurrentStatic()
view, _ := gui.g.View(context.GetViewName()) view, _ := gui.g.View(context.GetViewName())
return view return view
} }