mirror of
https://github.com/walles/moar.git
synced 2024-10-03 23:17:51 +03:00
Implement jumping to marks
This commit is contained in:
parent
ab10a82b6c
commit
4867b2c2ed
5
go.mod
5
go.mod
@ -5,7 +5,10 @@ go 1.20
|
||||
require (
|
||||
github.com/alecthomas/chroma/v2 v2.12.0
|
||||
github.com/google/go-cmp v0.5.9
|
||||
github.com/klauspost/compress v1.17.4
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
github.com/ulikunitz/xz v0.5.11
|
||||
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
|
||||
golang.org/x/sys v0.1.0
|
||||
golang.org/x/term v0.0.0-20210503060354-a79de5458b56
|
||||
gotest.tools/v3 v3.3.0
|
||||
@ -13,7 +16,5 @@ require (
|
||||
|
||||
require (
|
||||
github.com/dlclark/regexp2 v1.10.0 // indirect
|
||||
github.com/klauspost/compress v1.17.4 // indirect
|
||||
github.com/stretchr/testify v1.7.0 // indirect
|
||||
github.com/ulikunitz/xz v0.5.11 // indirect
|
||||
)
|
||||
|
2
go.sum
2
go.sum
@ -28,6 +28,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
|
||||
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
|
81
m/pagermode-jump-to-mark.go
Normal file
81
m/pagermode-jump-to-mark.go
Normal file
@ -0,0 +1,81 @@
|
||||
package m
|
||||
|
||||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/walles/moar/twin"
|
||||
"golang.org/x/exp/maps"
|
||||
)
|
||||
|
||||
type PagerModeJumpToMark struct {
|
||||
pager *Pager
|
||||
}
|
||||
|
||||
func (m PagerModeJumpToMark) drawFooter(_ string, _ string) {
|
||||
p := m.pager
|
||||
|
||||
_, height := p.screen.Size()
|
||||
|
||||
pos := 0
|
||||
for _, token := range m.getMarkPrompt() {
|
||||
p.screen.SetCell(pos, height-1, twin.NewCell(token, twin.StyleDefault))
|
||||
pos++
|
||||
}
|
||||
|
||||
// Add a cursor
|
||||
p.screen.SetCell(pos, height-1, twin.NewCell(' ', twin.StyleDefault.WithAttr(twin.AttrReverse)))
|
||||
}
|
||||
|
||||
func (m PagerModeJumpToMark) getMarkPrompt() string {
|
||||
// Special case having zero, one or multiple marks
|
||||
if len(m.pager.marks) == 0 {
|
||||
return "Press \"m\" to set your first mark!"
|
||||
}
|
||||
|
||||
if len(m.pager.marks) == 1 {
|
||||
for key := range m.pager.marks {
|
||||
return "Press \"" + string(key) + "\" to jump to your mark!"
|
||||
}
|
||||
}
|
||||
|
||||
// Multiple marks, list them
|
||||
marks := maps.Keys(m.pager.marks)
|
||||
sort.Slice(marks, func(i, j int) bool {
|
||||
return marks[i] < marks[j]
|
||||
})
|
||||
|
||||
prompt := "Press a key to jump to your mark: "
|
||||
for i, mark := range marks {
|
||||
if i > 0 {
|
||||
prompt += ", "
|
||||
}
|
||||
prompt += string(mark)
|
||||
}
|
||||
|
||||
return prompt
|
||||
}
|
||||
|
||||
func (m PagerModeJumpToMark) onKey(key twin.KeyCode) {
|
||||
p := m.pager
|
||||
|
||||
switch key {
|
||||
case twin.KeyEnter, twin.KeyEscape:
|
||||
// Never mind I
|
||||
p.mode = PagerModeViewing{pager: p}
|
||||
|
||||
default:
|
||||
// Never mind II
|
||||
p.mode = PagerModeViewing{pager: p}
|
||||
p.mode.onKey(key)
|
||||
}
|
||||
}
|
||||
|
||||
func (m PagerModeJumpToMark) onRune(char rune) {
|
||||
destination, ok := m.pager.marks[char]
|
||||
if ok {
|
||||
m.pager.scrollPosition = destination
|
||||
}
|
||||
|
||||
//nolint:gosimple // The linter's advice is just wrong here
|
||||
m.pager.mode = PagerModeViewing{pager: m.pager}
|
||||
}
|
@ -6,13 +6,13 @@ type PagerModeMark struct {
|
||||
pager *Pager
|
||||
}
|
||||
|
||||
func (m PagerModeMark) drawFooter(statusText string, spinner string) {
|
||||
func (m PagerModeMark) drawFooter(_ string, _ string) {
|
||||
p := m.pager
|
||||
|
||||
_, height := p.screen.Size()
|
||||
|
||||
pos := 0
|
||||
for _, token := range "Press any key to label your mark: " + p.gotoLineString {
|
||||
for _, token := range "Press any key to label your mark: " {
|
||||
p.screen.SetCell(pos, height-1, twin.NewCell(token, twin.StyleDefault))
|
||||
pos++
|
||||
}
|
||||
@ -39,5 +39,6 @@ func (m PagerModeMark) onKey(key twin.KeyCode) {
|
||||
func (m PagerModeMark) onRune(char rune) {
|
||||
m.pager.marks[char] = m.pager.scrollPosition
|
||||
|
||||
//nolint:gosimple // The linter's advice is just wrong here
|
||||
m.pager.mode = PagerModeViewing{pager: m.pager}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user