summaryrefslogtreecommitdiffstats
path: root/pkg/gui/gui.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-30 10:23:39 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-03-17 19:13:40 +1100
commit2692637fbeac353d805399dd97714c235f88f303 (patch)
tree3352c0067a5ae99e82d0bd5e66db9b1d4fc01388 /pkg/gui/gui.go
parent77d0732fa81baad97dff7d2e5abd3fa6f6c9cda1 (diff)
standardise naming
Diffstat (limited to 'pkg/gui/gui.go')
-rw-r--r--pkg/gui/gui.go26
1 files changed, 13 insertions, 13 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 6796d16de..1d9ee2d76 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -144,9 +144,9 @@ type Gui struct {
PrevLayout PrevLayout
c *types.ControllerCommon
- refHelper *RefHelper
+ refsHelper *RefsHelper
suggestionsHelper *SuggestionsHelper
- fileHelper *FileHelper
+ filesHelper *FilesHelper
workingTreeHelper *WorkingTreeHelper
// 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 }
getContexts := func() context.ContextTree { return gui.State.Contexts }
// TODO: have a getGit function too
- refHelper := NewRefHelper(
+ refsHelper := NewRefsHelper(
controllerCommon,
gui.git,
getState,
)
- gui.refHelper = refHelper
+ gui.refsHelper = refsHelper
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 })
- tagActions := controllers.NewTagActions(controllerCommon, gui.git)
+ tagsHelper := controllers.NewTagsHelper(controllerCommon, gui.git)
syncController := controllers.NewSyncController(
controllerCommon,
@@ -617,8 +617,8 @@ func (gui *Gui) setControllers() {
gui.getSelectedPath,
gui.switchToMerge,
gui.suggestionsHelper,
- gui.refHelper,
- gui.fileHelper,
+ gui.refsHelper,
+ gui.filesHelper,
gui.workingTreeHelper,
),
Tags: controllers.NewTagsController(
@@ -626,8 +626,8 @@ func (gui *Gui) setControllers() {
func() *context.TagsContext { return gui.State.Contexts.Tags },
gui.git,
getContexts,
- tagActions,
- refHelper,
+ tagsHelper,
+ refsHelper,
gui.suggestionsHelper,
gui.switchToSubCommitsContext,
),
@@ -636,8 +636,8 @@ func (gui *Gui) setControllers() {
func() types.IListContext { return gui.State.Contexts.BranchCommits },
osCommand,
gui.git,
- tagActions,
- refHelper,
+ tagsHelper,
+ refsHelper,
gui.getSelectedLocalCommit,
func() []*models.Commit { return gui.State.Commits },
func() int { return gui.State.Panels.Commits.SelectedLineIdx },
@@ -674,7 +674,7 @@ func (gui *Gui) setControllers() {
Undo: controllers.NewUndoController(
controllerCommon,
gui.git,
- refHelper,
+ refsHelper,
gui.workingTreeHelper,
func() []*models.Commit { return gui.State.FilteredReflogCommits },
),