summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/files_controller.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/controllers/files_controller.go
parent77d0732fa81baad97dff7d2e5abd3fa6f6c9cda1 (diff)
standardise naming
Diffstat (limited to 'pkg/gui/controllers/files_controller.go')
-rw-r--r--pkg/gui/controllers/files_controller.go18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
index e2626078d..8ce768ac6 100644
--- a/pkg/gui/controllers/files_controller.go
+++ b/pkg/gui/controllers/files_controller.go
@@ -39,8 +39,8 @@ type FilesController struct {
getSelectedPath func() string
switchToMergeFn func(path string) error
suggestionsHelper ISuggestionsHelper
- refHelper IRefHelper
- fileHelper IFileHelper
+ refsHelper IRefsHelper
+ filesHelper IFileHelper
workingTreeHelper IWorkingTreeHelper
}
@@ -63,8 +63,8 @@ func NewFilesController(
getSelectedPath func() string,
switchToMergeFn func(path string) error,
suggestionsHelper ISuggestionsHelper,
- refHelper IRefHelper,
- fileHelper IFileHelper,
+ refsHelper IRefsHelper,
+ filesHelper IFileHelper,
workingTreeHelper IWorkingTreeHelper,
) *FilesController {
return &FilesController{
@@ -84,8 +84,8 @@ func NewFilesController(
getSelectedPath: getSelectedPath,
switchToMergeFn: switchToMergeFn,
suggestionsHelper: suggestionsHelper,
- refHelper: refHelper,
- fileHelper: fileHelper,
+ refsHelper: refsHelper,
+ filesHelper: filesHelper,
workingTreeHelper: workingTreeHelper,
}
}
@@ -554,7 +554,7 @@ func (self *FilesController) edit(node *filetree.FileNode) error {
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 {
@@ -563,7 +563,7 @@ func (self *FilesController) Open() error {
return nil
}
- return self.fileHelper.OpenFile(node.GetPath())
+ return self.filesHelper.OpenFile(node.GetPath())
}
func (self *FilesController) switchToMerge() error {
@@ -627,7 +627,7 @@ func (self *FilesController) stash() error {
}
func (self *FilesController) createResetMenu() error {
- return self.refHelper.CreateGitResetMenu("@{upstream}")
+ return self.refsHelper.CreateGitResetMenu("@{upstream}")
}
func (self *FilesController) handleToggleDirCollapsed() error {