From 3db8175bb5f15201216abf531fca566112e8b664 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 8 Feb 2026 07:22:21 +1100 Subject: [PATCH] Rename GetFilter to GetStatusFilter on IFileTree This avoids a naming collision with GetFilter from the IFilterableContext interface, which will be implemented by FileTreeViewModel in the next commit. Co-Authored-By: Claude Opus 4.6 --- pkg/gui/controllers/files_controller.go | 8 ++++---- pkg/gui/controllers/helpers/refresh_helper.go | 4 ++-- pkg/gui/filetree/file_tree.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 9efe2f8f6..5b6cbcef2 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -449,7 +449,7 @@ func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) e if len(unstagedSelectedNodes) > 0 { var extraArgs []string - if self.context().GetFilter() == filetree.DisplayTracked { + if self.context().GetStatusFilter() == filetree.DisplayTracked { extraArgs = []string{"-u"} } @@ -648,7 +648,7 @@ func (self *FilesController) toggleStagedAllWithLock() error { return err } - onlyTrackedFiles := self.context().GetFilter() == filetree.DisplayTracked + onlyTrackedFiles := self.context().GetStatusFilter() == filetree.DisplayTracked if err := self.c.Git().WorkingTree.StageAll(onlyTrackedFiles); err != nil { return err } @@ -836,7 +836,7 @@ func (self *FilesController) isResolvingConflicts() bool { } func (self *FilesController) handleStatusFilterPressed() error { - currentFilter := self.context().GetFilter() + currentFilter := self.context().GetStatusFilter() return self.c.Menu(types.CreateMenuOptions{ Title: self.c.Tr.FilteringMenuTitle, Items: []*types.MenuItem{ @@ -904,7 +904,7 @@ func (self *FilesController) filteringLabel(filter filetree.FileTreeDisplayFilte } func (self *FilesController) setStatusFiltering(filter filetree.FileTreeDisplayFilter) error { - previousFilter := self.context().GetFilter() + previousFilter := self.context().GetStatusFilter() self.context().FileTreeViewModel.SetStatusFilter(filter) self.c.Contexts().Files.GetView().Subtitle = self.filteringLabel(filter) diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index b81c81763..5ea58c3b2 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -594,11 +594,11 @@ func (self *RefreshHelper) refreshStateFiles() error { // only taking over the filter if it hasn't already been set by the user. if conflictFileCount > 0 && prevConflictFileCount == 0 { - if fileTreeViewModel.GetFilter() == filetree.DisplayAll { + if fileTreeViewModel.GetStatusFilter() == filetree.DisplayAll { fileTreeViewModel.SetStatusFilter(filetree.DisplayConflicted) self.c.Contexts().Files.GetView().Subtitle = self.c.Tr.FilterLabelConflictingFiles } - } else if conflictFileCount == 0 && fileTreeViewModel.GetFilter() == filetree.DisplayConflicted { + } else if conflictFileCount == 0 && fileTreeViewModel.GetStatusFilter() == filetree.DisplayConflicted { fileTreeViewModel.SetStatusFilter(filetree.DisplayAll) self.c.Contexts().Files.GetView().Subtitle = "" } diff --git a/pkg/gui/filetree/file_tree.go b/pkg/gui/filetree/file_tree.go index d0056a0a8..8190c379a 100644 --- a/pkg/gui/filetree/file_tree.go +++ b/pkg/gui/filetree/file_tree.go @@ -46,7 +46,7 @@ type IFileTree interface { GetFile(path string) *models.File GetAllItems() []*FileNode GetAllFiles() []*models.File - GetFilter() FileTreeDisplayFilter + GetStatusFilter() FileTreeDisplayFilter GetRoot() *FileNode } @@ -210,6 +210,6 @@ func (self *FileTree) CollapsedPaths() *CollapsedPaths { return self.collapsedPaths } -func (self *FileTree) GetFilter() FileTreeDisplayFilter { +func (self *FileTree) GetStatusFilter() FileTreeDisplayFilter { return self.filter }