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

working version of previous match

Browse source
This commit is contained in:
Mikael Fangel 2023-04-04 18:12:57 +02:00 committed by Maas Lalani
parent e804267b1e
commit 582000fa04
No known key found for this signature in database
GPG key ID: 5A6ED5CBF1A0A000
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pager/search.go
View file

@ -107,28 +107,25 @@ func (s *search) PrevMatch(m *model) {
query := regexp.MustCompile("(" + metastring[:leftPadding+1] + ")(" + s.query.String() + ")(" + metastring[len(metastring)-rightPadding-1:] + ")")
m.content = query.ReplaceAllString(m.content, "$2")
}
// Find the string to highlight.
var i int
var nextMatch string
for i = 0; s.query.FindString(m.content[i:s.lastMatchLoc]) != ""; i++ {
nextMatch = s.query.FindString(m.content[i:s.lastMatchLoc])
var prev []int
leftPadding, _ := utils.LipglossLengthPadding(s.prevMatch, m.matchHighlightStyle)
allMatches := s.query.FindAllSubmatchIndex([]byte(m.content), -1)
for i, subm := range allMatches {
if prev != nil && subm[1]+leftPadding == s.lastMatchLoc {
// Highliht the current match.
m.content = m.content[:prev[0]] + strings.Replace(m.content[prev[0]:], m.content[prev[0]:prev[1]], m.matchHighlightStyle.Render(m.content[prev[0]:prev[1]]), 1)
s.lastMatchLoc = prev[1] + leftPadding
break
}
// If reaching this at the end of the loop we have looked through all matches.
if i == len(allMatches)-1 {
m.content = m.content[:subm[0]] + strings.Replace(m.content[subm[0]:], m.content[subm[0]:subm[1]], m.matchHighlightStyle.Render(m.content[subm[0]:subm[1]]), 1)
s.lastMatchLoc = subm[1] + leftPadding
}
prev = subm
}
s.prevMatch = nextMatch
if nextMatch == "" {
// Start the search from the beginning of the document.
s.lastMatchLoc = len(m.content) - 1
m.viewport.GotoBottom()
return
}
// Highliht the current match.
m.content = m.content[:i] + strings.Replace(m.content[i:], nextMatch, m.matchHighlightStyle.Render(nextMatch), 1)
// Update the postion of the last found match.
for i = 0; s.query.FindString(m.content[i:s.lastMatchLoc]) != ""; i++ {
} //revive:disable-line:empty-block
s.lastMatchLoc = i
// Update the viewport position.
line := 0