walles/moar
1
1
Fork 0
mirror of https://github.com/walles/moar.git synced 2024-11-30 02:34:13 +03:00
Code Issues Projects Releases Wiki Activity

Warn about unexpected pager modes

Browse Source
This commit is contained in:
Johan Walles 2019-07-06 07:54:33 +02:00
parent ed657dbde6
commit 0f7ae9d089
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m/pager.go
View File

@ -94,7 +94,7 @@ func (p *_Pager) _AddLines(logger *log.Logger) {
p._SetFooter(lines.statusText + " Press ESC / q to exit, '/' to search")
default:
panic(fmt.Sprintf("Unsupported pager mode %v", p.mode))
panic(fmt.Sprint("Unsupported pager mode: ", p.mode))
}
}
@ -190,7 +190,7 @@ func (p *_Pager) _ScrollToNextSearchHit() {
firstSearchLineOneBased = 1
default:
panic(fmt.Sprintf("Unknown search mode when finding next: %v", p.mode))
panic(fmt.Sprint("Unknown search mode when finding next: ", p.mode))
}
firstHitLine := p._FindFirstHitLineOneBased(firstSearchLineOneBased)
@ -253,7 +253,9 @@ func (p *_Pager) _OnKey(logger *log.Logger, key tcell.Key) {
p._OnSearchKey(logger, key)
return
}
// FIXME: Else verify that mode is either Viewing on NotFound, otherwise panic
if p.mode != _Viewing && p.mode != _NotFound {
panic(fmt.Sprint("Unhandled mode: ", p.mode))
}
// Reset the not-found marker on non-search keypresses
p.mode = _Viewing
@ -302,7 +304,9 @@ func (p *_Pager) _OnRune(logger *log.Logger, char rune) {
p._OnSearchRune(logger, char)
return
}
// FIXME: Else verify that mode is either Viewing on NotFound, otherwise panic
if p.mode != _Viewing && p.mode != _NotFound {
panic(fmt.Sprint("Unhandled mode: ", p.mode))
}
switch char {
case 'q':