go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

Use searching, not filtering, in file tree views

Browse Source 
There's more work to be done to support filtering for these views so we're sticking with searching for now
This commit is contained in:
Jesse Duffield
2023-06-26 11:15:47 +10:00
parent cd989d8ebe
commit 8e46b8a275
7 changed files with 33 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkg/gui/context/working_tree_context.go
View File

@@ -9,24 +9,16 @@ import (
)
type WorkingTreeContext struct {
*FilteredList[*models.File]
*filetree.FileTreeViewModel
*ListContextTrait
*SearchTrait
}
var (
_ types.IListContext = (*WorkingTreeContext)(nil)
_ types.IFilterableContext = (*WorkingTreeContext)(nil)
)
var _ types.IListContext = (*WorkingTreeContext)(nil)
func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
filteredList := NewFilteredList(
func() []*models.File { return c.Model().Files },
func(file *models.File) []string { return []string{file.GetPath()} },
)
viewModel := filetree.NewFileTreeViewModel(
func() []*models.File { return filteredList.GetFilteredList() },
func() []*models.File { return c.Model().Files },
c.Log,
c.UserConfig.Gui.ShowFileTree,
)
@@ -38,8 +30,8 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
})
}
return &WorkingTreeContext{
FilteredList: filteredList,
ctx := &WorkingTreeContext{
SearchTrait: NewSearchTrait(c),
FileTreeViewModel: viewModel,
ListContextTrait: &ListContextTrait{
Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
@@ -54,6 +46,13 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
c: c,
},
}
ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(selectedLineIdx int) error {
ctx.GetList().SetSelectedLineIdx(selectedLineIdx)
return ctx.HandleFocus(types.OnFocusOpts{})
}))
return ctx
}
func (self *WorkingTreeContext) GetSelectedItemId() string {
@@ -64,17 +63,3 @@ func (self *WorkingTreeContext) GetSelectedItemId() string {
return item.ID()
}
// used for type switch
func (self *WorkingTreeContext) IsFilterableContext() {}
// TODO: see if we can just call SetTree() within HandleRender(). It doesn't seem
// right that we need to imperatively refresh the view model like this
func (self *WorkingTreeContext) SetFilter(filter string) {
self.FilteredList.SetFilter(filter)
self.SetTree()
}
func (self *WorkingTreeContext) ClearFilter() {
self.SetFilter("")
}