Some code cleanup (jesseduffield#4449)

stefanhaller · web-flow · commit ed0cc8b70bd4 · 2025-04-08T16:11:00.000+02:00
- **PR Description**

Two cleanup commits.
diff --git a/pkg/gui/context.go b/pkg/gui/context.go
@@ -55,17 +55,7 @@ func (self *ContextMgr) Replace(c types.Context) {
 	self.Activate(c, types.OnFocusOpts{})
 }
 
-func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) {
-	if len(opts) > 1 {
-		panic("cannot pass multiple opts to Push")
-	}
-
-	singleOpts := types.OnFocusOpts{}
-	if len(opts) > 0 {
-		// using triple dot but you should only ever pass one of these opt structs
-		singleOpts = opts[0]
-	}
-
+func (self *ContextMgr) Push(c types.Context, opts types.OnFocusOpts) {
 	if !c.IsFocusable() {
 		return
 	}
@@ -77,7 +67,7 @@ func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) {
 	}
 
 	if contextToActivate != nil {
-		self.Activate(contextToActivate, singleOpts)
+		self.Activate(contextToActivate, opts)
 	}
 }
 
diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go
@@ -213,7 +213,7 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
 					if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil {
 						return err
 					}
-					self.c.Context().Push(self.c.Contexts().LocalCommits)
+					self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
 					return nil
 				})
 			},
diff --git a/pkg/gui/controllers/filtering_menu_action.go b/pkg/gui/controllers/filtering_menu_action.go
@@ -120,7 +120,7 @@ func (self *FilteringMenuAction) setFiltering() error {
 		repoState.SetScreenMode(types.SCREEN_HALF)
 	}
 
-	self.c.Context().Push(self.c.Contexts().LocalCommits)
+	self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
 
 	return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}, Then: func() error {
 		self.c.Contexts().LocalCommits.SetSelection(0)
diff --git a/pkg/gui/controllers/helpers/commits_helper.go b/pkg/gui/controllers/helpers/commits_helper.go
@@ -12,10 +12,6 @@ import (
 	"github.com/samber/lo"
 )
 
-type ICommitsHelper interface {
-	UpdateCommitPanelView(message string)
-}
-
 type CommitsHelper struct {
 	c *HelperCommon
 
@@ -26,8 +22,6 @@ type CommitsHelper struct {
 	setCommitDescription          func(string)
 }
 
-var _ ICommitsHelper = &CommitsHelper{}
-
 func NewCommitsHelper(
 	c *HelperCommon,
 	getCommitSummary func() string,
@@ -150,7 +144,7 @@ func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOp
 
 	self.UpdateCommitPanelView(opts.InitialMessage)
 
-	self.c.Context().Push(self.c.Contexts().CommitMessage)
+	self.c.Context().Push(self.c.Contexts().CommitMessage, types.OnFocusOpts{})
 }
 
 func (self *CommitsHelper) OnCommitSuccess() {
diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go
@@ -177,7 +177,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 
 	self.c.State().GetRepoState().SetCurrentPopupOpts(&opts)
 
-	self.c.Context().Push(self.c.Contexts().Confirmation)
+	self.c.Context().Push(self.c.Contexts().Confirmation, types.OnFocusOpts{})
 }
 
 func (self *ConfirmationHelper) setKeyBindings(cancel goContext.CancelFunc, opts types.CreatePopupPanelOpts) {
diff --git a/pkg/gui/controllers/helpers/files_helper.go b/pkg/gui/controllers/helpers/files_helper.go
@@ -6,12 +6,6 @@ import (
 	"github.com/samber/lo"
 )
 
-type IFilesHelper interface {
-	EditFiles(filenames []string) error
-	EditFileAtLine(filename string, lineNumber int) error
-	OpenFile(filename string) error
-}
-
 type FilesHelper struct {
 	c *HelperCommon
 }
@@ -22,8 +16,6 @@ func NewFilesHelper(c *HelperCommon) *FilesHelper {
 	}
 }
 
-var _ IFilesHelper = &FilesHelper{}
-
 func (self *FilesHelper) EditFiles(filenames []string) error {
 	absPaths := lo.Map(filenames, func(filename string, _ int) string {
 		absPath, err := filepath.Abs(filename)
diff --git a/pkg/gui/controllers/helpers/fixup_helper.go b/pkg/gui/controllers/helpers/fixup_helper.go
@@ -137,7 +137,7 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error {
 		}
 
 		self.c.Contexts().LocalCommits.SetSelection(index)
-		self.c.Context().Push(self.c.Contexts().LocalCommits)
+		self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
 		return nil
 	}
 
diff --git a/pkg/gui/controllers/helpers/host_helper.go b/pkg/gui/controllers/helpers/host_helper.go
@@ -6,11 +6,6 @@ import (
 
 // this helper just wraps our hosting_service package
 
-type IHostHelper interface {
-	GetPullRequestURL(from string, to string) (string, error)
-	GetCommitURL(commitHash string) (string, error)
-}
-
 type HostHelper struct {
 	c *HelperCommon
 }
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -206,7 +206,7 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error {
 			{
 				Label: self.c.Tr.ViewConflictsMenuItem,
 				OnPress: func() error {
-					self.c.Context().Push(self.c.Contexts().Files)
+					self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
 					return nil
 				},
 			},
@@ -357,7 +357,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
 				if err = self.ResetMarkedBaseCommit(); err != nil {
 					return err
 				}
-				self.c.Context().Push(self.c.Contexts().LocalCommits)
+				self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
 				return nil
 			},
 		},
diff --git a/pkg/gui/controllers/helpers/merge_conflicts_helper.go b/pkg/gui/controllers/helpers/merge_conflicts_helper.go
@@ -62,7 +62,7 @@ func (self *MergeConflictsHelper) EscapeMerge() error {
 		// files context over it.
 		// So long as both places call OnUIThread, we're fine.
 		if self.c.Context().IsCurrent(self.c.Contexts().MergeConflicts) {
-			self.c.Context().Push(self.c.Contexts().Files)
+			self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
 		}
 		return nil
 	})
@@ -93,7 +93,7 @@ func (self *MergeConflictsHelper) SwitchToMerge(path string) error {
 		}
 	}
 
-	self.c.Context().Push(self.c.Contexts().MergeConflicts)
+	self.c.Context().Push(self.c.Contexts().MergeConflicts, types.OnFocusOpts{})
 	return nil
 }
 
diff --git a/pkg/gui/controllers/helpers/patch_building_helper.go b/pkg/gui/controllers/helpers/patch_building_helper.go
@@ -9,10 +9,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
-type IPatchBuildingHelper interface {
-	ValidateNormalWorkingTreeState() (bool, error)
-}
-
 type PatchBuildingHelper struct {
 	c *HelperCommon
 }
diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go
@@ -14,15 +14,6 @@ import (
 	"github.com/samber/lo"
 )
 
-type IRefsHelper interface {
-	CheckoutRef(ref string, options types.CheckoutRefOptions) error
-	GetCheckedOutRef() *models.Branch
-	CreateGitResetMenu(ref string) error
-	CreateCheckoutMenu(commit *models.Commit) error
-	ResetToRef(ref string, strength string, envVars []string) error
-	NewBranch(from string, fromDescription string, suggestedBranchname string) error
-}
-
 type RefsHelper struct {
 	c *HelperCommon
 }
@@ -35,8 +26,6 @@ func NewRefsHelper(
 	}
 }
 
-var _ IRefsHelper = &RefsHelper{}
-
 func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error {
 	waitingStatus := options.WaitingStatus
 	if waitingStatus == "" {
@@ -118,7 +107,7 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN
 		// Switch to the branches context _before_ starting to check out the
 		// branch, so that we see the inline status
 		if self.c.Context().Current() != self.c.Contexts().Branches {
-			self.c.Context().Push(self.c.Contexts().Branches)
+			self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
 		}
 		return self.CheckoutRef(branchName, types.CheckoutRefOptions{})
 	}
@@ -334,7 +323,7 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 
 	refresh := func() error {
 		if self.c.Context().Current() != self.c.Contexts().Branches {
-			self.c.Context().Push(self.c.Contexts().Branches)
+			self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
 		}
 
 		self.c.Contexts().LocalCommits.SetSelection(0)
diff --git a/pkg/gui/controllers/helpers/search_helper.go b/pkg/gui/controllers/helpers/search_helper.go
@@ -41,7 +41,7 @@ func (self *SearchHelper) OpenFilterPrompt(context types.IFilterableContext) err
 	self.OnPromptContentChanged("")
 	promptView.RenderTextArea()
 
-	self.c.Context().Push(self.c.Contexts().Search)
+	self.c.Context().Push(self.c.Contexts().Search, types.OnFocusOpts{})
 
 	return self.c.ResetKeybindings()
 }
@@ -58,7 +58,7 @@ func (self *SearchHelper) OpenSearchPrompt(context types.ISearchableContext) err
 	promptView.ClearTextArea()
 	promptView.RenderTextArea()
 
-	self.c.Context().Push(self.c.Contexts().Search)
+	self.c.Context().Push(self.c.Contexts().Search, types.OnFocusOpts{})
 
 	return self.c.ResetKeybindings()
 }
diff --git a/pkg/gui/controllers/helpers/staging_helper.go b/pkg/gui/controllers/helpers/staging_helper.go
@@ -114,7 +114,7 @@ func (self *StagingHelper) RefreshStagingPanel(focusOpts types.OnFocusOpts) {
 }
 
 func (self *StagingHelper) handleStagingEscape() {
-	self.c.Context().Push(self.c.Contexts().Files)
+	self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
 }
 
 func (self *StagingHelper) secondaryStagingFocused() bool {
diff --git a/pkg/gui/controllers/helpers/sub_commits_helper.go b/pkg/gui/controllers/helpers/sub_commits_helper.go
@@ -69,6 +69,6 @@ func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error {
 
 	self.c.PostRefreshUpdate(self.c.Contexts().SubCommits)
 
-	self.c.Context().Push(self.c.Contexts().SubCommits)
+	self.c.Context().Push(self.c.Contexts().SubCommits, types.OnFocusOpts{})
 	return nil
 }
diff --git a/pkg/gui/controllers/helpers/suggestions_helper.go b/pkg/gui/controllers/helpers/suggestions_helper.go
@@ -26,20 +26,10 @@ import (
 // finding suggestions in this file, so that it's easy to see if a function already
 // exists for fetching a particular model.
 
-type ISuggestionsHelper interface {
-	GetRemoteSuggestionsFunc() func(string) []*types.Suggestion
-	GetBranchNameSuggestionsFunc() func(string) []*types.Suggestion
-	GetFilePathSuggestionsFunc() func(string) []*types.Suggestion
-	GetRemoteBranchesSuggestionsFunc(separator string) func(string) []*types.Suggestion
-	GetRefsSuggestionsFunc() func(string) []*types.Suggestion
-}
-
 type SuggestionsHelper struct {
 	c *HelperCommon
 }
 
-var _ ISuggestionsHelper = &SuggestionsHelper{}
-
 func NewSuggestionsHelper(
 	c *HelperCommon,
 ) *SuggestionsHelper {
diff --git a/pkg/gui/controllers/helpers/upstream_helper.go b/pkg/gui/controllers/helpers/upstream_helper.go
@@ -14,15 +14,6 @@ type UpstreamHelper struct {
 	getRemoteBranchesSuggestionsFunc func(string) func(string) []*types.Suggestion
 }
 
-type IUpstreamHelper interface {
-	ParseUpstream(string) (string, string, error)
-	PromptForUpstreamWithInitialContent(*models.Branch, func(string) error) error
-	PromptForUpstreamWithoutInitialContent(*models.Branch, func(string) error) error
-	GetSuggestedRemote() string
-}
-
-var _ IUpstreamHelper = &UpstreamHelper{}
-
 func NewUpstreamHelper(
 	c *HelperCommon,
 	getRemoteBranchesSuggestionsFunc func(string) func(string) []*types.Suggestion,
diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go
@@ -12,13 +12,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
-type IWorkingTreeHelper interface {
-	AnyStagedFiles() bool
-	AnyTrackedFiles() bool
-	IsWorkingTreeDirty() bool
-	FileForSubmodule(submodule *models.SubmoduleConfig) *models.File
-}
-
 type WorkingTreeHelper struct {
 	c             *HelperCommon
 	refHelper     *RefsHelper
diff --git a/pkg/gui/controllers/helpers/worktree_helper.go b/pkg/gui/controllers/helpers/worktree_helper.go
@@ -12,11 +12,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
-type IWorktreeHelper interface {
-	GetMainWorktreeName() string
-	GetCurrentWorktreeName() string
-}
-
 type WorktreeHelper struct {
 	c                 *HelperCommon
 	reposHelper       *ReposHelper
diff --git a/pkg/gui/controllers/jump_to_side_window_controller.go b/pkg/gui/controllers/jump_to_side_window_controller.go
@@ -56,7 +56,7 @@ func (self *JumpToSideWindowController) goToSideWindow(window string) func() err
 
 		context := self.c.Helpers().Window.GetContextForWindow(window)
 
-		self.c.Context().Push(context)
+		self.c.Context().Push(context, types.OnFocusOpts{})
 		return nil
 	}
 }
diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go
@@ -179,7 +179,7 @@ func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error {
 
 func (self *ListController) pushContextIfNotFocused() error {
 	if !self.isFocused() {
-		self.c.Context().Push(self.context)
+		self.c.Context().Push(self.context, types.OnFocusOpts{})
 	}
 
 	return nil
diff --git a/pkg/gui/controllers/quit_actions.go b/pkg/gui/controllers/quit_actions.go
@@ -79,7 +79,7 @@ func (self *QuitActions) Escape() error {
 	parentContext := currentContext.GetParentContext()
 	if parentContext != nil {
 		// TODO: think about whether this should be marked as a return rather than adding to the stack
-		self.c.Context().Push(parentContext)
+		self.c.Context().Push(parentContext, types.OnFocusOpts{})
 		return nil
 	}
 
diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go
@@ -129,7 +129,7 @@ func (self *RemotesController) enter(remote *models.Remote) error {
 
 	self.c.PostRefreshUpdate(remoteBranchesContext)
 
-	self.c.Context().Push(remoteBranchesContext)
+	self.c.Context().Push(remoteBranchesContext, types.OnFocusOpts{})
 	return nil
 }
 
diff --git a/pkg/gui/controllers/side_window_controller.go b/pkg/gui/controllers/side_window_controller.go
@@ -69,7 +69,7 @@ func (self *SideWindowController) previousSideWindow() error {
 
 	context := self.c.Helpers().Window.GetContextForWindow(newWindow)
 
-	self.c.Context().Push(context)
+	self.c.Context().Push(context, types.OnFocusOpts{})
 	return nil
 }
 
@@ -93,6 +93,6 @@ func (self *SideWindowController) nextSideWindow() error {
 
 	context := self.c.Helpers().Window.GetContextForWindow(newWindow)
 
-	self.c.Context().Push(context)
+	self.c.Context().Push(context, types.OnFocusOpts{})
 	return nil
 }
diff --git a/pkg/gui/controllers/snake_controller.go b/pkg/gui/controllers/snake_controller.go
@@ -73,6 +73,6 @@ func (self *SnakeController) SetDirection(direction snake.Direction) func() erro
 }
 
 func (self *SnakeController) Escape() error {
-	self.c.Context().Push(self.c.Contexts().Submodules)
+	self.c.Context().Push(self.c.Contexts().Submodules, types.OnFocusOpts{})
 	return nil
 }
diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go
@@ -180,7 +180,7 @@ func (self *StagingController) Escape() error {
 
 func (self *StagingController) TogglePanel() error {
 	if self.otherContext.GetState() != nil {
-		self.c.Context().Push(self.otherContext)
+		self.c.Context().Push(self.otherContext, types.OnFocusOpts{})
 	}
 
 	return nil
diff --git a/pkg/gui/controllers/stash_controller.go b/pkg/gui/controllers/stash_controller.go
diff --git a/pkg/gui/controllers/status_controller.go b/pkg/gui/controllers/status_controller.go
diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go
diff --git a/pkg/gui/controllers/switch_to_diff_files_controller.go b/pkg/gui/controllers/switch_to_diff_files_controller.go
diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
diff --git a/pkg/gui/extras_panel.go b/pkg/gui/extras_panel.go
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go
diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go

Original file line number	Diff line number	Diff line change
`@@ -55,17 +55,7 @@ func (self *ContextMgr) Replace(c types.Context) {`
`55`	`55`	`self.Activate(c, types.OnFocusOpts{})`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) {`
`59`		`- if len(opts) > 1 {`
`60`		`- panic("cannot pass multiple opts to Push")`
`61`		`- }`
`62`		`-`
`63`		`- singleOpts := types.OnFocusOpts{}`
`64`		`- if len(opts) > 0 {`
`65`		`- // using triple dot but you should only ever pass one of these opt structs`
`66`		`- singleOpts = opts[0]`
`67`		`- }`
`68`		`-`
	`58`	`+func (self *ContextMgr) Push(c types.Context, opts types.OnFocusOpts) {`
`69`	`59`	`if !c.IsFocusable() {`
`70`	`60`	`return`
`71`	`61`	`}`
`@@ -77,7 +67,7 @@ func (self *ContextMgr) Push(c types.Context, opts ...types.OnFocusOpts) {`
`77`	`67`	`}`
`78`	`68`
`79`	`69`	`if contextToActivate != nil {`
`80`		`- self.Activate(contextToActivate, singleOpts)`
	`70`	`+ self.Activate(contextToActivate, opts)`
`81`	`71`	`}`
`82`	`72`	`}`
`83`	`73`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {`
`213`	`213`	`if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil {`
`214`	`214`	`return err`
`215`	`215`	`}`
`216`		`- self.c.Context().Push(self.c.Contexts().LocalCommits)`
	`216`	`+ self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})`
`217`	`217`	`return nil`
`218`	`218`	`})`
`219`	`219`	`},`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (self *FilteringMenuAction) setFiltering() error {`
`120`	`120`	`repoState.SetScreenMode(types.SCREEN_HALF)`
`121`	`121`	`}`
`122`	`122`
`123`		`- self.c.Context().Push(self.c.Contexts().LocalCommits)`
	`123`	`+ self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})`
`124`	`124`
`125`	`125`	`return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}, Then: func() error {`
`126`	`126`	`self.c.Contexts().LocalCommits.SetSelection(0)`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ`
`177`	`177`
`178`	`178`	`self.c.State().GetRepoState().SetCurrentPopupOpts(&opts)`
`179`	`179`
`180`		`- self.c.Context().Push(self.c.Contexts().Confirmation)`
	`180`	`+ self.c.Context().Push(self.c.Contexts().Confirmation, types.OnFocusOpts{})`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`func (self *ConfirmationHelper) setKeyBindings(cancel goContext.CancelFunc, opts types.CreatePopupPanelOpts) {`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,6 @@ import (`
`6`	`6`	`"github.com/samber/lo"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type IFilesHelper interface {`
`10`		`- EditFiles(filenames []string) error`
`11`		`- EditFileAtLine(filename string, lineNumber int) error`
`12`		`- OpenFile(filename string) error`
`13`		`-}`
`14`		`-`
`15`	`9`	`type FilesHelper struct {`
`16`	`10`	`c *HelperCommon`
`17`	`11`	`}`
`@@ -22,8 +16,6 @@ func NewFilesHelper(c HelperCommon) FilesHelper {`
`22`	`16`	`}`
`23`	`17`	`}`
`24`	`18`
`25`		`-var _ IFilesHelper = &FilesHelper{}`
`26`		`-`
`27`	`19`	`func (self *FilesHelper) EditFiles(filenames []string) error {`
`28`	`20`	`absPaths := lo.Map(filenames, func(filename string, _ int) string {`
`29`	`21`	`absPath, err := filepath.Abs(filename)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`self.c.Contexts().LocalCommits.SetSelection(index)`
`140`		`- self.c.Context().Push(self.c.Contexts().LocalCommits)`
	`140`	`+ self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})`
`141`	`141`	`return nil`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (self *MergeConflictsHelper) EscapeMerge() error {`
`62`	`62`	`// files context over it.`
`63`	`63`	`// So long as both places call OnUIThread, we're fine.`
`64`	`64`	`if self.c.Context().IsCurrent(self.c.Contexts().MergeConflicts) {`
`65`		`- self.c.Context().Push(self.c.Contexts().Files)`
	`65`	`+ self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})`
`66`	`66`	`}`
`67`	`67`	`return nil`
`68`	`68`	`})`
`@@ -93,7 +93,7 @@ func (self *MergeConflictsHelper) SwitchToMerge(path string) error {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- self.c.Context().Push(self.c.Contexts().MergeConflicts)`
	`96`	`+ self.c.Context().Push(self.c.Contexts().MergeConflicts, types.OnFocusOpts{})`
`97`	`97`	`return nil`
`98`	`98`	`}`
`99`	`99`