Allow filtering worktrees by branch name in Worktrees pane (#5980)

Closes #5945.

pkg/gui/context/worktrees_context.go

@@ -16,8 +16,8 @@ var _ types.IListContext = (*WorktreesContext)(nil)
 func NewWorktreesContext(c *ContextCommon) *WorktreesContext {
 	viewModel := NewFilteredListViewModel(
 		func() []*models.Worktree { return c.Model().Worktrees },
-		func(Worktree *models.Worktree) []string {
-			return []string{Worktree.Name}
+		func(worktree *models.Worktree) []string {
+			return []string{worktree.Name, worktree.Branch}
 		},
 	)
 

pkg/integration/tests/filter_and_search/filter_worktrees.go

@@ -0,0 +1,35 @@
+package filter_and_search
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var FilterWorktrees = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Filtering worktrees by branch name",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("initial commit")
+		shell.NewBranch("branch-aaa")
+		shell.NewBranch("branch-xxx")
+		shell.Checkout("master")
+		shell.AddWorktreeCheckout("branch-aaa", "../worktree-xxx")
+		shell.AddWorktreeCheckout("branch-xxx", "../worktree-1")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Worktrees().
+			Focus().
+			Lines(
+				Contains("(main worktree)").IsSelected(),
+				Contains("worktree-1   branch-xxx"),
+				Contains("worktree-xxx branch-aaa"),
+			).
+			FilterOrSearch("xxx").
+			Lines(
+				Contains("worktree-1   branch-xxx"),
+				Contains("worktree-xxx branch-aaa"),
+			)
+	},
+})

pkg/integration/tests/test_list.go

@@ -270,6 +270,7 @@ var tests = []*components.IntegrationTest{
 	filter_and_search.FilterRemotes,
 	filter_and_search.FilterSearchHistory,
 	filter_and_search.FilterUpdatesWhenModelChanges,
+	filter_and_search.FilterWorktrees,
 	filter_and_search.NestedFilter,
 	filter_and_search.NestedFilterTransient,
 	filter_and_search.NewSearch,