mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-28 05:46:16 +02:00
c74448f00d
Previously there was no way to render a view's search status without also moving the cursor to the current search match. This caused issues where we wanted to display the status after leaving the view and coming back, or when beginning a new search from within the view. This commit separates the two use cases so we only move the cursor when we're actually selecting the next search match
87 lines
1.9 KiB
Go
87 lines
1.9 KiB
Go
package context
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
)
|
|
|
|
type SearchTrait struct {
|
|
c *ContextCommon
|
|
*SearchHistory
|
|
|
|
searchString string
|
|
}
|
|
|
|
func NewSearchTrait(c *ContextCommon) *SearchTrait {
|
|
return &SearchTrait{
|
|
c: c,
|
|
SearchHistory: NewSearchHistory(),
|
|
}
|
|
}
|
|
|
|
func (self *SearchTrait) GetSearchString() string {
|
|
return self.searchString
|
|
}
|
|
|
|
func (self *SearchTrait) SetSearchString(searchString string) {
|
|
self.searchString = searchString
|
|
}
|
|
|
|
func (self *SearchTrait) ClearSearchString() {
|
|
self.SetSearchString("")
|
|
}
|
|
|
|
// used for type switch
|
|
func (self *SearchTrait) IsSearchableContext() {}
|
|
|
|
func (self *SearchTrait) onSelectItemWrapper(innerFunc func(int) error) func(int, int, int) error {
|
|
return func(selectedLineIdx int, index int, total int) error {
|
|
self.RenderSearchStatus(index, total)
|
|
|
|
if total != 0 {
|
|
if err := innerFunc(selectedLineIdx); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (self *SearchTrait) RenderSearchStatus(index int, total int) {
|
|
keybindingConfig := self.c.UserConfig.Keybinding
|
|
|
|
if total == 0 {
|
|
self.c.SetViewContent(
|
|
self.c.Views().Search,
|
|
fmt.Sprintf(
|
|
self.c.Tr.NoMatchesFor,
|
|
self.searchString,
|
|
theme.OptionsFgColor.Sprintf(self.c.Tr.ExitSearchMode, keybindings.Label(keybindingConfig.Universal.Return)),
|
|
),
|
|
)
|
|
} else {
|
|
self.c.SetViewContent(
|
|
self.c.Views().Search,
|
|
fmt.Sprintf(
|
|
self.c.Tr.MatchesFor,
|
|
self.searchString,
|
|
index+1,
|
|
total,
|
|
theme.OptionsFgColor.Sprintf(
|
|
self.c.Tr.SearchKeybindings,
|
|
keybindings.Label(keybindingConfig.Universal.NextMatch),
|
|
keybindings.Label(keybindingConfig.Universal.PrevMatch),
|
|
keybindings.Label(keybindingConfig.Universal.Return),
|
|
),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
|
|
func (self *SearchTrait) IsSearching() bool {
|
|
return self.searchString != ""
|
|
}
|