From afa9fae0bdb1f19f62dc081f4c882ac6a5af23e5 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 28 Apr 2022 16:09:12 -0400 Subject: [PATCH 1/3] fix: lint warn --- help/help.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/help/help.go b/help/help.go index 6db06491..90971ac4 100644 --- a/help/help.go +++ b/help/help.go @@ -164,11 +164,10 @@ func (m Model) FullHelpView(groups [][]key.Binding) string { return "" } + // Linter note: at this time we don't think it's worth the additional + // code complexity involved in preallocating this slice. + //nolint:prealloc var ( - // Linter note: at this time we don't think it's worth the additional - // code complexity involved in preallocating this slice. - // - //nolint:prealloc out []string totalWidth int From d4c25774a2f0528bc706efe4f3aceffe4c60a7c9 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 28 Apr 2022 16:09:31 -0400 Subject: [PATCH 2/3] fix: add viewport keymap help --- viewport/keymap.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/viewport/keymap.go b/viewport/keymap.go index f410f480..6e92f097 100644 --- a/viewport/keymap.go +++ b/viewport/keymap.go @@ -22,21 +22,27 @@ func DefaultKeyMap() KeyMap { return KeyMap{ PageDown: key.NewBinding( key.WithKeys("pgdown", spacebar, "f"), + key.WithHelp("f/pgdn", "page down"), ), PageUp: key.NewBinding( key.WithKeys("pgup", "b"), + key.WithHelp("b/pgup", "page up"), ), HalfPageUp: key.NewBinding( key.WithKeys("u", "ctrl+u"), + key.WithHelp("ctrl+u/u", "half page up"), ), HalfPageDown: key.NewBinding( key.WithKeys("d", "ctrl+d"), + key.WithHelp("ctrl+d/d", "half page down"), ), Up: key.NewBinding( key.WithKeys("up", "k"), + key.WithHelp("↑/k", "up"), ), Down: key.NewBinding( key.WithKeys("down", "j"), + key.WithHelp("↓/j", "down"), ), } } From f07e2c0cd57587758db8b896ef7f24ec1492c5eb Mon Sep 17 00:00:00 2001 From: Christian Rocha Date: Thu, 28 Apr 2022 21:31:01 -0400 Subject: [PATCH 3/3] chore: shorten half page up/down help widths --- viewport/keymap.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/viewport/keymap.go b/viewport/keymap.go index 6e92f097..9289706a 100644 --- a/viewport/keymap.go +++ b/viewport/keymap.go @@ -30,11 +30,11 @@ func DefaultKeyMap() KeyMap { ), HalfPageUp: key.NewBinding( key.WithKeys("u", "ctrl+u"), - key.WithHelp("ctrl+u/u", "half page up"), + key.WithHelp("u", "½ page up"), ), HalfPageDown: key.NewBinding( key.WithKeys("d", "ctrl+d"), - key.WithHelp("ctrl+d/d", "half page down"), + key.WithHelp("d", "½ page down"), ), Up: key.NewBinding( key.WithKeys("up", "k"),