extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-08-04 21:05:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve logic for padding for highlighting search queries to fix off-by-one error that happens when there are no matches

Browse Source
This commit is contained in:
David Dworken
2023-12-19 14:01:04 -08:00
parent 9070b85f36
commit 3c33513fa3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/tui/tui.go
View File

@ -716,6 +716,7 @@ func makeTable(ctx context.Context, rows []table.Row) (table.Model, error) {
if err != nil {
// Failed to compile the regex for highlighting matches, this should never happen. In this
// case, just use a regexp that matches nothing to ensure that the TUI doesn't crash.
hctx.GetLogger().Infof("Failed to compile regex %#v for query %#v, disabling highlighting of matches", queryRegex, CURRENT_QUERY_FOR_HIGHLIGHTING)
re = MATCH_NOTHING_REGEXP
} else {
re = r
@ -756,11 +757,13 @@ func makeTable(ctx context.Context, rows []table.Row) (table.Model, error) {
matchStartIdx := match[0]
matchEndIdx := match[1]
beforeMatch := value[lastIncludedIdx:matchStartIdx]
if beforeMatch != "" {
ret += renderChunk(beforeMatch, false, lastIncludedIdx == 0, false)
}
match := value[matchStartIdx:matchEndIdx]
ret += renderChunk(match, true, matchStartIdx == 0, matchEndIdx == len(value))
if beforeMatch != "" {
ret += renderChunk(beforeMatch, false, lastIncludedIdx == 0, lastIncludedIdx+1 == len(value))
}
if match != "" {
ret += renderChunk(match, true, matchStartIdx == 0, matchEndIdx == len(value))
}
lastIncludedIdx = matchEndIdx
}
if lastIncludedIdx != len(value) {