deblan-mirror/gum
deblan-mirror/gum
1
0
Fork 0
mirror of https://github.com/charmbracelet/gum synced 2024-06-08 16:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

optimisations and change in matching pattern

Browse source
This commit is contained in:
Mikael Fangel 2023-04-06 18:35:25 +02:00 committed by Maas Lalani
parent c576e347a0
commit 603b3a286c
No known key found for this signature in database
GPG key ID: 5A6ED5CBF1A0A000
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pager/search.go
View file

@ -43,6 +43,11 @@ func (s *search) Execute(m *model) {
s.query = regexp.MustCompile(s.input.Value())
query := regexp.MustCompile(fmt.Sprintf("(%s)", s.query.String()))
m.content = query.ReplaceAllString(m.content, m.matchStyle.Render("$1"))
// Recompile the regex to match the an replace the highlights.
leftPad, rightPad := utils.LipglossLengthPadding("", m.matchStyle)
metaString := m.matchStyle.Render("")
s.query = regexp.MustCompile(regexp.QuoteMeta(metaString[:leftPad]) + s.query.String() + regexp.QuoteMeta(metaString[rightPad:]))
}
func (s *search) Done() {
@ -58,9 +63,11 @@ func (s *search) NextMatch(m *model) {
return
}
// Remove Previvous highlight.
m.content = strings.Replace(m.content, s.matchLipglossStr, s.matchString, 1)
allMatches := s.query.FindAllStringSubmatchIndex(m.content, -1)
// Highlight the next match.
allMatches := s.query.FindAllStringIndex(m.content, -1)
s.matchIndex = (s.matchIndex + 1) % len(allMatches)
match := allMatches[s.matchIndex]
lhs := m.content[:match[0]]
@ -92,9 +99,11 @@ func (s *search) PrevMatch(m *model) {
return
}
// Remove Previvous highlight.
m.content = strings.Replace(m.content, s.matchLipglossStr, s.matchString, 1)
allMatches := s.query.FindAllStringSubmatchIndex(m.content, -1)
// Highlight the previous match.
allMatches := s.query.FindAllStringIndex(m.content, -1)
s.matchIndex = (s.matchIndex - 1) % len(allMatches)
if s.matchIndex < 0 {
s.matchIndex = 0