1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00

standardise naming

This commit is contained in:
Jesse Duffield 2022-01-30 10:23:39 +11:00
parent 77d0732fa8
commit 2692637fbe
16 changed files with 84 additions and 84 deletions

View File

@ -58,7 +58,7 @@ func (gui *Gui) handleBranchPress() error {
} }
branch := gui.getSelectedBranch() branch := gui.getSelectedBranch()
gui.c.LogAction(gui.c.Tr.Actions.CheckoutBranch) gui.c.LogAction(gui.c.Tr.Actions.CheckoutBranch)
return gui.refHelper.CheckoutRef(branch.Name, types.CheckoutRefOptions{}) return gui.refsHelper.CheckoutRef(branch.Name, types.CheckoutRefOptions{})
} }
func (gui *Gui) handleCreatePullRequestPress() error { func (gui *Gui) handleCreatePullRequestPress() error {
@ -134,7 +134,7 @@ func (gui *Gui) handleCheckoutByName() error {
FindSuggestionsFunc: gui.suggestionsHelper.GetRefsSuggestionsFunc(), FindSuggestionsFunc: gui.suggestionsHelper.GetRefsSuggestionsFunc(),
HandleConfirm: func(response string) error { HandleConfirm: func(response string) error {
gui.c.LogAction("Checkout branch") gui.c.LogAction("Checkout branch")
return gui.refHelper.CheckoutRef(response, types.CheckoutRefOptions{ return gui.refsHelper.CheckoutRef(response, types.CheckoutRefOptions{
OnRefNotFound: func(ref string) error { OnRefNotFound: func(ref string) error {
return gui.c.Ask(types.AskOpts{ return gui.c.Ask(types.AskOpts{
Title: gui.c.Tr.BranchNotFoundTitle, Title: gui.c.Tr.BranchNotFoundTitle,
@ -328,7 +328,7 @@ func (gui *Gui) handleCreateResetToBranchMenu() error {
return nil return nil
} }
return gui.refHelper.CreateGitResetMenu(branch.Name) return gui.refsHelper.CreateGitResetMenu(branch.Name)
} }
func (gui *Gui) handleRenameBranch() error { func (gui *Gui) handleRenameBranch() error {

View File

@ -126,7 +126,7 @@ func (gui *Gui) handleOpenOldCommitFile() error {
return nil return nil
} }
return gui.fileHelper.OpenFile(node.GetPath()) return gui.filesHelper.OpenFile(node.GetPath())
} }
func (gui *Gui) handleEditCommitFile() error { func (gui *Gui) handleEditCommitFile() error {
@ -139,7 +139,7 @@ func (gui *Gui) handleEditCommitFile() error {
return gui.c.ErrorMsg(gui.c.Tr.ErrCannotEditDirectory) return gui.c.ErrorMsg(gui.c.Tr.ErrCannotEditDirectory)
} }
return gui.fileHelper.EditFile(node.GetPath()) return gui.filesHelper.EditFile(node.GetPath())
} }
func (gui *Gui) handleToggleFileForPatch() error { func (gui *Gui) handleToggleFileForPatch() error {

View File

@ -39,8 +39,8 @@ type FilesController struct {
getSelectedPath func() string getSelectedPath func() string
switchToMergeFn func(path string) error switchToMergeFn func(path string) error
suggestionsHelper ISuggestionsHelper suggestionsHelper ISuggestionsHelper
refHelper IRefHelper refsHelper IRefsHelper
fileHelper IFileHelper filesHelper IFileHelper
workingTreeHelper IWorkingTreeHelper workingTreeHelper IWorkingTreeHelper
} }
@ -63,8 +63,8 @@ func NewFilesController(
getSelectedPath func() string, getSelectedPath func() string,
switchToMergeFn func(path string) error, switchToMergeFn func(path string) error,
suggestionsHelper ISuggestionsHelper, suggestionsHelper ISuggestionsHelper,
refHelper IRefHelper, refsHelper IRefsHelper,
fileHelper IFileHelper, filesHelper IFileHelper,
workingTreeHelper IWorkingTreeHelper, workingTreeHelper IWorkingTreeHelper,
) *FilesController { ) *FilesController {
return &FilesController{ return &FilesController{
@ -84,8 +84,8 @@ func NewFilesController(
getSelectedPath: getSelectedPath, getSelectedPath: getSelectedPath,
switchToMergeFn: switchToMergeFn, switchToMergeFn: switchToMergeFn,
suggestionsHelper: suggestionsHelper, suggestionsHelper: suggestionsHelper,
refHelper: refHelper, refsHelper: refsHelper,
fileHelper: fileHelper, filesHelper: filesHelper,
workingTreeHelper: workingTreeHelper, workingTreeHelper: workingTreeHelper,
} }
} }
@ -554,7 +554,7 @@ func (self *FilesController) edit(node *filetree.FileNode) error {
return self.c.ErrorMsg(self.c.Tr.ErrCannotEditDirectory) return self.c.ErrorMsg(self.c.Tr.ErrCannotEditDirectory)
} }
return self.fileHelper.EditFile(node.GetPath()) return self.filesHelper.EditFile(node.GetPath())
} }
func (self *FilesController) Open() error { func (self *FilesController) Open() error {
@ -563,7 +563,7 @@ func (self *FilesController) Open() error {
return nil return nil
} }
return self.fileHelper.OpenFile(node.GetPath()) return self.filesHelper.OpenFile(node.GetPath())
} }
func (self *FilesController) switchToMerge() error { func (self *FilesController) switchToMerge() error {
@ -627,7 +627,7 @@ func (self *FilesController) stash() error {
} }
func (self *FilesController) createResetMenu() error { func (self *FilesController) createResetMenu() error {
return self.refHelper.CreateGitResetMenu("@{upstream}") return self.refsHelper.CreateGitResetMenu("@{upstream}")
} }
func (self *FilesController) handleToggleDirCollapsed() error { func (self *FilesController) handleToggleDirCollapsed() error {

View File

@ -28,8 +28,8 @@ type LocalCommitsController struct {
getContext func() types.IListContext getContext func() types.IListContext
os *oscommands.OSCommand os *oscommands.OSCommand
git *commands.GitCommand git *commands.GitCommand
tagActions *TagActions tagsHelper *TagsHelper
refHelper IRefHelper refsHelper IRefsHelper
getSelectedLocalCommit func() *models.Commit getSelectedLocalCommit func() *models.Commit
getCommits func() []*models.Commit getCommits func() []*models.Commit
@ -52,8 +52,8 @@ func NewLocalCommitsController(
getContext func() types.IListContext, getContext func() types.IListContext,
os *oscommands.OSCommand, os *oscommands.OSCommand,
git *commands.GitCommand, git *commands.GitCommand,
tagActions *TagActions, tagsHelper *TagsHelper,
refHelper IRefHelper, refsHelper IRefsHelper,
getSelectedLocalCommit func() *models.Commit, getSelectedLocalCommit func() *models.Commit,
getCommits func() []*models.Commit, getCommits func() []*models.Commit,
getSelectedLocalCommitIdx func() int, getSelectedLocalCommitIdx func() int,
@ -72,8 +72,8 @@ func NewLocalCommitsController(
getContext: getContext, getContext: getContext,
os: os, os: os,
git: git, git: git,
tagActions: tagActions, tagsHelper: tagsHelper,
refHelper: refHelper, refsHelper: refsHelper,
getSelectedLocalCommit: getSelectedLocalCommit, getSelectedLocalCommit: getSelectedLocalCommit,
getCommits: getCommits, getCommits: getCommits,
getSelectedLocalCommitIdx: getSelectedLocalCommitIdx, getSelectedLocalCommitIdx: getSelectedLocalCommitIdx,
@ -606,7 +606,7 @@ func (self *LocalCommitsController) handleSquashAllAboveFixupCommits(commit *mod
} }
func (self *LocalCommitsController) handleTagCommit(commit *models.Commit) error { func (self *LocalCommitsController) handleTagCommit(commit *models.Commit) error {
return self.tagActions.CreateTagMenu(commit.Sha, func() {}) return self.tagsHelper.CreateTagMenu(commit.Sha, func() {})
} }
func (self *LocalCommitsController) handleCheckoutCommit(commit *models.Commit) error { func (self *LocalCommitsController) handleCheckoutCommit(commit *models.Commit) error {
@ -615,13 +615,13 @@ func (self *LocalCommitsController) handleCheckoutCommit(commit *models.Commit)
Prompt: self.c.Tr.SureCheckoutThisCommit, Prompt: self.c.Tr.SureCheckoutThisCommit,
HandleConfirm: func() error { HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.CheckoutCommit) self.c.LogAction(self.c.Tr.Actions.CheckoutCommit)
return self.refHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{}) return self.refsHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{})
}, },
}) })
} }
func (self *LocalCommitsController) handleCreateCommitResetMenu(commit *models.Commit) error { func (self *LocalCommitsController) handleCreateCommitResetMenu(commit *models.Commit) error {
return self.refHelper.CreateGitResetMenu(commit.Sha) return self.refsHelper.CreateGitResetMenu(commit.Sha)
} }
func (self *LocalCommitsController) handleOpenSearch(string) error { func (self *LocalCommitsController) handleOpenSearch(string) error {

View File

@ -14,9 +14,9 @@ type TagsController struct {
getContext func() *context.TagsContext getContext func() *context.TagsContext
git *commands.GitCommand git *commands.GitCommand
getContexts func() context.ContextTree getContexts func() context.ContextTree
tagActions *TagActions tagsHelper *TagsHelper
refHelper IRefHelper refsHelper IRefsHelper
suggestionsHelper ISuggestionsHelper suggestionsHelper ISuggestionsHelper
switchToSubCommitsContext func(string) error switchToSubCommitsContext func(string) error
@ -29,8 +29,8 @@ func NewTagsController(
getContext func() *context.TagsContext, getContext func() *context.TagsContext,
git *commands.GitCommand, git *commands.GitCommand,
getContexts func() context.ContextTree, getContexts func() context.ContextTree,
tagActions *TagActions, tagsHelper *TagsHelper,
refHelper IRefHelper, refsHelper IRefsHelper,
suggestionsHelper ISuggestionsHelper, suggestionsHelper ISuggestionsHelper,
switchToSubCommitsContext func(string) error, switchToSubCommitsContext func(string) error,
@ -40,8 +40,8 @@ func NewTagsController(
getContext: getContext, getContext: getContext,
git: git, git: git,
getContexts: getContexts, getContexts: getContexts,
tagActions: tagActions, tagsHelper: tagsHelper,
refHelper: refHelper, refsHelper: refsHelper,
suggestionsHelper: suggestionsHelper, suggestionsHelper: suggestionsHelper,
switchToSubCommitsContext: switchToSubCommitsContext, switchToSubCommitsContext: switchToSubCommitsContext,
@ -88,7 +88,7 @@ func (self *TagsController) Keybindings(getKey func(key string) interface{}, con
func (self *TagsController) checkout(tag *models.Tag) error { func (self *TagsController) checkout(tag *models.Tag) error {
self.c.LogAction(self.c.Tr.Actions.CheckoutTag) self.c.LogAction(self.c.Tr.Actions.CheckoutTag)
if err := self.refHelper.CheckoutRef(tag.Name, types.CheckoutRefOptions{}); err != nil { if err := self.refsHelper.CheckoutRef(tag.Name, types.CheckoutRefOptions{}); err != nil {
return err return err
} }
return self.c.PushContext(self.getContexts().Branches) return self.c.PushContext(self.getContexts().Branches)
@ -146,12 +146,12 @@ func (self *TagsController) push(tag *models.Tag) error {
} }
func (self *TagsController) createResetMenu(tag *models.Tag) error { func (self *TagsController) createResetMenu(tag *models.Tag) error {
return self.refHelper.CreateGitResetMenu(tag.Name) return self.refsHelper.CreateGitResetMenu(tag.Name)
} }
func (self *TagsController) create() error { func (self *TagsController) create() error {
// leaving commit SHA blank so that we're just creating the tag for the current commit // leaving commit SHA blank so that we're just creating the tag for the current commit
return self.tagActions.CreateTagMenu("", func() { self.getContext().GetPanelState().SetSelectedLineIdx(0) }) return self.tagsHelper.CreateTagMenu("", func() { self.getContext().GetPanelState().SetSelectedLineIdx(0) })
} }
func (self *TagsController) withSelectedTag(f func(tag *models.Tag) error) func() error { func (self *TagsController) withSelectedTag(f func(tag *models.Tag) error) func() error {

View File

@ -5,23 +5,23 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
) )
// Actions structs are for defining functionality that could be used by multiple contexts. // Helper structs are for defining functionality that could be used by multiple contexts.
// For example, here we have a CreateTagMenu which is applicable to both the tags context // For example, here we have a CreateTagMenu which is applicable to both the tags context
// and the commits context. // and the commits context.
type TagActions struct { type TagsHelper struct {
c *types.ControllerCommon c *types.ControllerCommon
git *commands.GitCommand git *commands.GitCommand
} }
func NewTagActions(c *types.ControllerCommon, git *commands.GitCommand) *TagActions { func NewTagsHelper(c *types.ControllerCommon, git *commands.GitCommand) *TagsHelper {
return &TagActions{ return &TagsHelper{
c: c, c: c,
git: git, git: git,
} }
} }
func (self *TagActions) CreateTagMenu(commitSha string, onCreate func()) error { func (self *TagsHelper) CreateTagMenu(commitSha string, onCreate func()) error {
return self.c.Menu(types.CreateMenuOptions{ return self.c.Menu(types.CreateMenuOptions{
Title: self.c.Tr.TagMenuTitle, Title: self.c.Tr.TagMenuTitle,
Items: []*types.MenuItem{ Items: []*types.MenuItem{
@ -41,14 +41,14 @@ func (self *TagActions) CreateTagMenu(commitSha string, onCreate func()) error {
}) })
} }
func (self *TagActions) afterTagCreate(onCreate func()) error { func (self *TagsHelper) afterTagCreate(onCreate func()) error {
onCreate() onCreate()
return self.c.Refresh(types.RefreshOptions{ return self.c.Refresh(types.RefreshOptions{
Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}, Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS},
}) })
} }
func (self *TagActions) handleCreateAnnotatedTag(commitSha string, onCreate func()) error { func (self *TagsHelper) handleCreateAnnotatedTag(commitSha string, onCreate func()) error {
return self.c.Prompt(types.PromptOpts{ return self.c.Prompt(types.PromptOpts{
Title: self.c.Tr.TagNameTitle, Title: self.c.Tr.TagNameTitle,
HandleConfirm: func(tagName string) error { HandleConfirm: func(tagName string) error {
@ -66,7 +66,7 @@ func (self *TagActions) handleCreateAnnotatedTag(commitSha string, onCreate func
}) })
} }
func (self *TagActions) handleCreateLightweightTag(commitSha string, onCreate func()) error { func (self *TagsHelper) handleCreateLightweightTag(commitSha string, onCreate func()) error {
return self.c.Prompt(types.PromptOpts{ return self.c.Prompt(types.PromptOpts{
Title: self.c.Tr.TagNameTitle, Title: self.c.Tr.TagNameTitle,
HandleConfirm: func(tagName string) error { HandleConfirm: func(tagName string) error {

View File

@ -5,7 +5,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
) )
type IRefHelper interface { type IRefsHelper interface {
CheckoutRef(ref string, options types.CheckoutRefOptions) error CheckoutRef(ref string, options types.CheckoutRefOptions) error
CreateGitResetMenu(ref string) error CreateGitResetMenu(ref string) error
ResetToRef(ref string, strength string, envVars []string) error ResetToRef(ref string, strength string, envVars []string) error

View File

@ -23,7 +23,7 @@ type UndoController struct {
c *types.ControllerCommon c *types.ControllerCommon
git *commands.GitCommand git *commands.GitCommand
refHelper IRefHelper refsHelper IRefsHelper
workingTreeHelper IWorkingTreeHelper workingTreeHelper IWorkingTreeHelper
getFilteredReflogCommits func() []*models.Commit getFilteredReflogCommits func() []*models.Commit
@ -34,7 +34,7 @@ var _ types.IController = &UndoController{}
func NewUndoController( func NewUndoController(
c *types.ControllerCommon, c *types.ControllerCommon,
git *commands.GitCommand, git *commands.GitCommand,
refHelper IRefHelper, refsHelper IRefsHelper,
workingTreeHelper IWorkingTreeHelper, workingTreeHelper IWorkingTreeHelper,
getFilteredReflogCommits func() []*models.Commit, getFilteredReflogCommits func() []*models.Commit,
@ -42,7 +42,7 @@ func NewUndoController(
return &UndoController{ return &UndoController{
c: c, c: c,
git: git, git: git,
refHelper: refHelper, refsHelper: refsHelper,
workingTreeHelper: workingTreeHelper, workingTreeHelper: workingTreeHelper,
getFilteredReflogCommits: getFilteredReflogCommits, getFilteredReflogCommits: getFilteredReflogCommits,
@ -111,7 +111,7 @@ func (self *UndoController) reflogUndo() error {
}) })
case CHECKOUT: case CHECKOUT:
self.c.LogAction(self.c.Tr.Actions.Undo) self.c.LogAction(self.c.Tr.Actions.Undo)
return true, self.refHelper.CheckoutRef(action.from, types.CheckoutRefOptions{ return true, self.refsHelper.CheckoutRef(action.from, types.CheckoutRefOptions{
EnvVars: undoEnvVars, EnvVars: undoEnvVars,
WaitingStatus: undoingStatus, WaitingStatus: undoingStatus,
}) })
@ -149,7 +149,7 @@ func (self *UndoController) reflogRedo() error {
}) })
case CHECKOUT: case CHECKOUT:
self.c.LogAction(self.c.Tr.Actions.Redo) self.c.LogAction(self.c.Tr.Actions.Redo)
return true, self.refHelper.CheckoutRef(action.to, types.CheckoutRefOptions{ return true, self.refsHelper.CheckoutRef(action.to, types.CheckoutRefOptions{
EnvVars: redoEnvVars, EnvVars: redoEnvVars,
WaitingStatus: redoingStatus, WaitingStatus: redoingStatus,
}) })
@ -224,7 +224,7 @@ type hardResetOptions struct {
// only to be used in the undo flow for now (does an autostash) // only to be used in the undo flow for now (does an autostash)
func (self *UndoController) hardResetWithAutoStash(commitSha string, options hardResetOptions) error { func (self *UndoController) hardResetWithAutoStash(commitSha string, options hardResetOptions) error {
reset := func() error { reset := func() error {
if err := self.refHelper.ResetToRef(commitSha, "hard", options.EnvVars); err != nil { if err := self.refsHelper.ResetToRef(commitSha, "hard", options.EnvVars); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }
return nil return nil

View File

@ -7,31 +7,31 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
) )
type FileHelper struct { type FilesHelper struct {
c *types.ControllerCommon c *types.ControllerCommon
git *commands.GitCommand git *commands.GitCommand
os *oscommands.OSCommand os *oscommands.OSCommand
} }
func NewFileHelper( func NewFilesHelper(
c *types.ControllerCommon, c *types.ControllerCommon,
git *commands.GitCommand, git *commands.GitCommand,
os *oscommands.OSCommand, os *oscommands.OSCommand,
) *FileHelper { ) *FilesHelper {
return &FileHelper{ return &FilesHelper{
c: c, c: c,
git: git, git: git,
os: os, os: os,
} }
} }
var _ controllers.IFileHelper = &FileHelper{} var _ controllers.IFileHelper = &FilesHelper{}
func (self *FileHelper) EditFile(filename string) error { func (self *FilesHelper) EditFile(filename string) error {
return self.EditFileAtLine(filename, 1) return self.EditFileAtLine(filename, 1)
} }
func (self *FileHelper) EditFileAtLine(filename string, lineNumber int) error { func (self *FilesHelper) EditFileAtLine(filename string, lineNumber int) error {
cmdStr, err := self.git.File.GetEditCmdStr(filename, lineNumber) cmdStr, err := self.git.File.GetEditCmdStr(filename, lineNumber)
if err != nil { if err != nil {
return self.c.Error(err) return self.c.Error(err)
@ -43,7 +43,7 @@ func (self *FileHelper) EditFileAtLine(filename string, lineNumber int) error {
) )
} }
func (self *FileHelper) OpenFile(filename string) error { func (self *FilesHelper) OpenFile(filename string) error {
self.c.LogAction(self.c.Tr.Actions.OpenFile) self.c.LogAction(self.c.Tr.Actions.OpenFile)
if err := self.os.OpenFile(filename); err != nil { if err := self.os.OpenFile(filename); err != nil {
return self.c.Error(err) return self.c.Error(err)

View File

@ -144,9 +144,9 @@ type Gui struct {
PrevLayout PrevLayout PrevLayout PrevLayout
c *types.ControllerCommon c *types.ControllerCommon
refHelper *RefHelper refsHelper *RefsHelper
suggestionsHelper *SuggestionsHelper suggestionsHelper *SuggestionsHelper
fileHelper *FileHelper filesHelper *FilesHelper
workingTreeHelper *WorkingTreeHelper workingTreeHelper *WorkingTreeHelper
// this is the initial dir we are in upon opening lazygit. We hold onto this // this is the initial dir we are in upon opening lazygit. We hold onto this
@ -571,17 +571,17 @@ func (gui *Gui) setControllers() {
getState := func() *GuiRepoState { return gui.State } getState := func() *GuiRepoState { return gui.State }
getContexts := func() context.ContextTree { return gui.State.Contexts } getContexts := func() context.ContextTree { return gui.State.Contexts }
// TODO: have a getGit function too // TODO: have a getGit function too
refHelper := NewRefHelper( refsHelper := NewRefsHelper(
controllerCommon, controllerCommon,
gui.git, gui.git,
getState, getState,
) )
gui.refHelper = refHelper gui.refsHelper = refsHelper
gui.suggestionsHelper = NewSuggestionsHelper(controllerCommon, getState, gui.refreshSuggestions) gui.suggestionsHelper = NewSuggestionsHelper(controllerCommon, getState, gui.refreshSuggestions)
gui.fileHelper = NewFileHelper(controllerCommon, gui.git, osCommand) gui.filesHelper = NewFilesHelper(controllerCommon, gui.git, osCommand)
gui.workingTreeHelper = NewWorkingTreeHelper(func() *filetree.FileTreeViewModel { return gui.State.FileTreeViewModel }) gui.workingTreeHelper = NewWorkingTreeHelper(func() *filetree.FileTreeViewModel { return gui.State.FileTreeViewModel })
tagActions := controllers.NewTagActions(controllerCommon, gui.git) tagsHelper := controllers.NewTagsHelper(controllerCommon, gui.git)
syncController := controllers.NewSyncController( syncController := controllers.NewSyncController(
controllerCommon, controllerCommon,
@ -617,8 +617,8 @@ func (gui *Gui) setControllers() {
gui.getSelectedPath, gui.getSelectedPath,
gui.switchToMerge, gui.switchToMerge,
gui.suggestionsHelper, gui.suggestionsHelper,
gui.refHelper, gui.refsHelper,
gui.fileHelper, gui.filesHelper,
gui.workingTreeHelper, gui.workingTreeHelper,
), ),
Tags: controllers.NewTagsController( Tags: controllers.NewTagsController(
@ -626,8 +626,8 @@ func (gui *Gui) setControllers() {
func() *context.TagsContext { return gui.State.Contexts.Tags }, func() *context.TagsContext { return gui.State.Contexts.Tags },
gui.git, gui.git,
getContexts, getContexts,
tagActions, tagsHelper,
refHelper, refsHelper,
gui.suggestionsHelper, gui.suggestionsHelper,
gui.switchToSubCommitsContext, gui.switchToSubCommitsContext,
), ),
@ -636,8 +636,8 @@ func (gui *Gui) setControllers() {
func() types.IListContext { return gui.State.Contexts.BranchCommits }, func() types.IListContext { return gui.State.Contexts.BranchCommits },
osCommand, osCommand,
gui.git, gui.git,
tagActions, tagsHelper,
refHelper, refsHelper,
gui.getSelectedLocalCommit, gui.getSelectedLocalCommit,
func() []*models.Commit { return gui.State.Commits }, func() []*models.Commit { return gui.State.Commits },
func() int { return gui.State.Panels.Commits.SelectedLineIdx }, func() int { return gui.State.Panels.Commits.SelectedLineIdx },
@ -674,7 +674,7 @@ func (gui *Gui) setControllers() {
Undo: controllers.NewUndoController( Undo: controllers.NewUndoController(
controllerCommon, controllerCommon,
gui.git, gui.git,
refHelper, refsHelper,
gui.workingTreeHelper, gui.workingTreeHelper,
func() []*models.Commit { return gui.State.FilteredReflogCommits }, func() []*models.Commit { return gui.State.FilteredReflogCommits },
), ),

View File

@ -285,5 +285,5 @@ func (gui *Gui) handleLineByLineEdit() error {
} }
lineNumber := gui.State.Panels.LineByLine.CurrentLineNumber() lineNumber := gui.State.Panels.LineByLine.CurrentLineNumber()
return gui.fileHelper.EditFileAtLine(file.Name, lineNumber) return gui.filesHelper.EditFileAtLine(file.Name, lineNumber)
} }

View File

@ -11,28 +11,28 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
) )
type RefHelper struct { type RefsHelper struct {
c *types.ControllerCommon c *types.ControllerCommon
git *commands.GitCommand git *commands.GitCommand
getState func() *GuiRepoState getState func() *GuiRepoState
} }
func NewRefHelper( func NewRefsHelper(
c *types.ControllerCommon, c *types.ControllerCommon,
git *commands.GitCommand, git *commands.GitCommand,
getState func() *GuiRepoState, getState func() *GuiRepoState,
) *RefHelper { ) *RefsHelper {
return &RefHelper{ return &RefsHelper{
c: c, c: c,
git: git, git: git,
getState: getState, getState: getState,
} }
} }
var _ controllers.IRefHelper = &RefHelper{} var _ controllers.IRefsHelper = &RefsHelper{}
func (self *RefHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error { func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error {
waitingStatus := options.WaitingStatus waitingStatus := options.WaitingStatus
if waitingStatus == "" { if waitingStatus == "" {
waitingStatus = self.c.Tr.CheckingOutStatus waitingStatus = self.c.Tr.CheckingOutStatus
@ -91,7 +91,7 @@ func (self *RefHelper) CheckoutRef(ref string, options types.CheckoutRefOptions)
}) })
} }
func (self *RefHelper) ResetToRef(ref string, strength string, envVars []string) error { func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string) error {
if err := self.git.Commit.ResetToCommit(ref, strength, envVars); err != nil { if err := self.git.Commit.ResetToCommit(ref, strength, envVars); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }
@ -112,7 +112,7 @@ func (self *RefHelper) ResetToRef(ref string, strength string, envVars []string)
return nil return nil
} }
func (self *RefHelper) CreateGitResetMenu(ref string) error { func (self *RefsHelper) CreateGitResetMenu(ref string) error {
strengths := []string{"soft", "mixed", "hard"} strengths := []string{"soft", "mixed", "hard"}
menuItems := make([]*types.MenuItem, len(strengths)) menuItems := make([]*types.MenuItem, len(strengths))
for i, strength := range strengths { for i, strength := range strengths {

View File

@ -48,7 +48,7 @@ func (gui *Gui) CheckoutReflogCommit() error {
Prompt: gui.c.Tr.SureCheckoutThisCommit, Prompt: gui.c.Tr.SureCheckoutThisCommit,
HandleConfirm: func() error { HandleConfirm: func() error {
gui.c.LogAction(gui.c.Tr.Actions.CheckoutReflogCommit) gui.c.LogAction(gui.c.Tr.Actions.CheckoutReflogCommit)
return gui.refHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{}) return gui.refsHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{})
}, },
}) })
if err != nil { if err != nil {
@ -63,7 +63,7 @@ func (gui *Gui) CheckoutReflogCommit() error {
func (gui *Gui) handleCreateReflogResetMenu() error { func (gui *Gui) handleCreateReflogResetMenu() error {
commit := gui.getSelectedReflogCommit() commit := gui.getSelectedReflogCommit()
return gui.refHelper.CreateGitResetMenu(commit.Sha) return gui.refsHelper.CreateGitResetMenu(commit.Sha)
} }
func (gui *Gui) handleViewReflogCommitFiles() error { func (gui *Gui) handleViewReflogCommitFiles() error {

View File

@ -107,5 +107,5 @@ func (gui *Gui) handleCreateResetToRemoteBranchMenu() error {
return nil return nil
} }
return gui.refHelper.CreateGitResetMenu(selectedBranch.FullName()) return gui.refsHelper.CreateGitResetMenu(selectedBranch.FullName())
} }

View File

@ -130,11 +130,11 @@ func (gui *Gui) askForConfigFile(action func(file string) error) error {
} }
func (gui *Gui) handleOpenConfig() error { func (gui *Gui) handleOpenConfig() error {
return gui.askForConfigFile(gui.fileHelper.OpenFile) return gui.askForConfigFile(gui.filesHelper.OpenFile)
} }
func (gui *Gui) handleEditConfig() error { func (gui *Gui) handleEditConfig() error {
return gui.askForConfigFile(gui.fileHelper.EditFile) return gui.askForConfigFile(gui.filesHelper.EditFile)
} }
func lazygitTitle() string { func lazygitTitle() string {

View File

@ -49,7 +49,7 @@ func (gui *Gui) handleCheckoutSubCommit() error {
Prompt: gui.c.Tr.SureCheckoutThisCommit, Prompt: gui.c.Tr.SureCheckoutThisCommit,
HandleConfirm: func() error { HandleConfirm: func() error {
gui.c.LogAction(gui.c.Tr.Actions.CheckoutCommit) gui.c.LogAction(gui.c.Tr.Actions.CheckoutCommit)
return gui.refHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{}) return gui.refsHelper.CheckoutRef(commit.Sha, types.CheckoutRefOptions{})
}, },
}) })
if err != nil { if err != nil {
@ -64,7 +64,7 @@ func (gui *Gui) handleCheckoutSubCommit() error {
func (gui *Gui) handleCreateSubCommitResetMenu() error { func (gui *Gui) handleCreateSubCommitResetMenu() error {
commit := gui.getSelectedSubCommit() commit := gui.getSelectedSubCommit()
return gui.refHelper.CreateGitResetMenu(commit.Sha) return gui.refsHelper.CreateGitResetMenu(commit.Sha)
} }
func (gui *Gui) handleViewSubCommitFiles() error { func (gui *Gui) handleViewSubCommitFiles() error {