go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

Don't omit section headers when filtering the keybindings menu

Browse Source
This commit is contained in:
Stefan Haller 2024-01-29 18:04:50 +01:00
parent 649048c336
commit 9f0b4d0000
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/gui/context/menu_context.go
View File

@ -112,13 +112,6 @@ func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
} }
func (self *MenuViewModel) GetNonModelItems() []*NonModelItem { func (self *MenuViewModel) GetNonModelItems() []*NonModelItem {
// Don't display section headers when we are filtering. The reason is that
// filtering changes the order of the items (they are sorted by best match),
// so all the sections would be messed up.
if self.FilteredListViewModel.IsFiltering() {
return []*NonModelItem{}
}
result := []*NonModelItem{} result := []*NonModelItem{}
menuItems := self.FilteredListViewModel.GetItems() menuItems := self.FilteredListViewModel.GetItems()
var prevSection *types.MenuSection = nil var prevSection *types.MenuSection = nil

1
pkg/integration/tests/filter_and_search/filter_menu.go
View File

@ -26,6 +26,7 @@ var FilterMenu = NewIntegrationTest(NewIntegrationTestArgs{
Filter("Ignore"). Filter("Ignore").
Lines( Lines(
// menu has filtered down to the one item that matches the filter // menu has filtered down to the one item that matches the filter
Contains(`--- Local ---`),
Contains(`Ignore`).IsSelected(), Contains(`Ignore`).IsSelected(),
). ).
Confirm() Confirm()

1
pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go
View File

@ -20,6 +20,7 @@ var FilterMenuCancelFilterWithEscape = NewIntegrationTest(NewIntegrationTestArgs
Filter("Ignore"). Filter("Ignore").
Lines( Lines(
// menu has filtered down to the one item that matches the filter // menu has filtered down to the one item that matches the filter
Contains(`--- Local ---`),
Contains(`Ignore`).IsSelected(), Contains(`Ignore`).IsSelected(),
) )