utils-shell/peco.peco
1
0
Fork 0
mirror of https://github.com/peco/peco.git synced 2026-09-10 07:16:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor paging related actions

Browse source
This commit is contained in:
Daisuke Maki 2026-02-17 00:04:51 +09:00
parent 470179cd60
commit 4cd07c8dd3
2 changed files with 65 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
action.go
View file

@ -58,6 +58,13 @@ func wrapDeprecated(fn func(context.Context, *Peco, Event), oldName, newName str
})
}
// makePagingAction creates an ActionFunc that sends the given PagingRequest.
func makePagingAction(req hub.PagingRequest) ActionFunc {
return ActionFunc(func(ctx context.Context, state *Peco, _ Event) {
state.Hub().SendPaging(ctx, req)
})
}
func init() {
// Build the global maps
nameToActions = map[string]Action{}
@ -91,23 +98,28 @@ func init() {
wrapDeprecated(doRotateFilter, "RotateMatcher", "RotateFilter").Register("RotateMatcher")
ActionFunc(doBackToInitialFilter).Register("BackToInitialFilter")
ActionFunc(doSelectUp).Register("SelectUp", keyseq.KeyArrowUp, keyseq.KeyCtrlP)
wrapDeprecated(doSelectDown, "SelectNext", "SelectUp/SelectDown").Register("SelectNext")
selectUp := makePagingAction(hub.ToLineAbove)
selectDown := makePagingAction(hub.ToLineBelow)
scrollPageUp := makePagingAction(hub.ToScrollPageUp)
scrollPageDown := makePagingAction(hub.ToScrollPageDown)
ActionFunc(doScrollPageDown).Register("ScrollPageDown", keyseq.KeyArrowRight, keyseq.KeyPgdn)
wrapDeprecated(doScrollPageDown, "SelectNextPage", "ScrollPageDown/ScrollPageUp").Register("SelectNextPage")
selectUp.Register("SelectUp", keyseq.KeyArrowUp, keyseq.KeyCtrlP)
wrapDeprecated(selectDown, "SelectNext", "SelectUp/SelectDown").Register("SelectNext")
ActionFunc(doSelectDown).Register("SelectDown", keyseq.KeyArrowDown, keyseq.KeyCtrlN)
wrapDeprecated(doSelectUp, "SelectPrevious", "SelectUp/SelectDown").Register("SelectPrevious")
scrollPageDown.Register("ScrollPageDown", keyseq.KeyArrowRight, keyseq.KeyPgdn)
wrapDeprecated(scrollPageDown, "SelectNextPage", "ScrollPageDown/ScrollPageUp").Register("SelectNextPage")
ActionFunc(doScrollPageUp).Register("ScrollPageUp", keyseq.KeyArrowLeft, keyseq.KeyPgup)
wrapDeprecated(doScrollPageUp, "SelectPreviousPage", "ScrollPageDown/ScrollPageUp").Register("SelectPreviousPage")
selectDown.Register("SelectDown", keyseq.KeyArrowDown, keyseq.KeyCtrlN)
wrapDeprecated(selectUp, "SelectPrevious", "SelectUp/SelectDown").Register("SelectPrevious")
ActionFunc(doScrollLeft).Register("ScrollLeft")
ActionFunc(doScrollRight).Register("ScrollRight")
scrollPageUp.Register("ScrollPageUp", keyseq.KeyArrowLeft, keyseq.KeyPgup)
wrapDeprecated(scrollPageUp, "SelectPreviousPage", "ScrollPageDown/ScrollPageUp").Register("SelectPreviousPage")
ActionFunc(doScrollFirstItem).Register("ScrollFirstItem", keyseq.KeyHome)
ActionFunc(doScrollLastItem).Register("ScrollLastItem", keyseq.KeyEnd)
makePagingAction(hub.ToScrollLeft).Register("ScrollLeft")
makePagingAction(hub.ToScrollRight).Register("ScrollRight")
makePagingAction(hub.ToScrollFirstItem).Register("ScrollFirstItem", keyseq.KeyHome)
makePagingAction(hub.ToScrollLastItem).Register("ScrollLastItem", keyseq.KeyEnd)
ActionFunc(doToggleSelection).Register("ToggleSelection")
ActionFunc(doToggleSelectionAndSelectNext).Register(
@ -399,46 +411,6 @@ func doCancel(ctx context.Context, state *Peco, e Event) {
state.Exit(err)
}
func doSelectDown(ctx context.Context, state *Peco, e Event) {
if pdebug.Enabled {
g := pdebug.Marker("doSelectDown")
defer g.End()
}
state.Hub().SendPaging(ctx, hub.ToLineBelow)
}
func doSelectUp(ctx context.Context, state *Peco, e Event) {
if pdebug.Enabled {
g := pdebug.Marker("doSelectUp")
defer g.End()
}
state.Hub().SendPaging(ctx, hub.ToLineAbove)
}
func doScrollPageUp(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollPageUp)
}
func doScrollPageDown(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollPageDown)
}
func doScrollLeft(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollLeft)
}
func doScrollRight(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollRight)
}
func doScrollFirstItem(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollFirstItem)
}
func doScrollLastItem(ctx context.Context, state *Peco, e Event) {
state.Hub().SendPaging(ctx, hub.ToScrollLastItem)
}
// batchAction extracts the top-level action call flag from the context,
// runs fn inside a Hub.Batch, and marks nested calls as non-top-level.
func batchAction(ctx context.Context, state *Peco, fn func(context.Context)) {
@ -453,9 +425,9 @@ func doToggleSelectionAndSelectNext(ctx context.Context, state *Peco, e Event) {
batchAction(ctx, state, func(ctx context.Context) {
doToggleSelection(ctx, state, e)
if state.LayoutType() != LayoutTypeBottomUp {
doSelectDown(ctx, state, e)
state.Hub().SendPaging(ctx, hub.ToLineBelow)
} else {
doSelectUp(ctx, state, e)
state.Hub().SendPaging(ctx, hub.ToLineAbove)
}
})
}

39
action_test.go
View file

@ -87,6 +87,45 @@ func TestActionFunc(t *testing.T) {
}
}
func TestPagingActions(t *testing.T) {
ctx := context.Background()
tests := []struct {
name string
action string
expected hub.PagingRequest
}{
{"SelectUp", "peco.SelectUp", hub.ToLineAbove},
{"SelectDown", "peco.SelectDown", hub.ToLineBelow},
{"ScrollPageUp", "peco.ScrollPageUp", hub.ToScrollPageUp},
{"ScrollPageDown", "peco.ScrollPageDown", hub.ToScrollPageDown},
{"ScrollLeft", "peco.ScrollLeft", hub.ToScrollLeft},
{"ScrollRight", "peco.ScrollRight", hub.ToScrollRight},
{"ScrollFirstItem", "peco.ScrollFirstItem", hub.ToScrollFirstItem},
{"ScrollLastItem", "peco.ScrollLastItem", hub.ToScrollLastItem},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
rHub := &recordingHub{}
state := New()
state.hub = rHub
state.selection = NewSelection()
state.currentLineBuffer = NewMemoryBuffer(0)
action, ok := nameToActions[tt.action]
require.True(t, ok, "action %s should exist", tt.action)
action.Execute(ctx, state, Event{})
pagingArgs := rHub.getPagingArgs()
require.Len(t, pagingArgs, 1, "expected exactly one SendPaging call")
require.Equal(t, tt.expected, pagingArgs[0],
"expected paging request %v, got %v", tt.expected, pagingArgs[0])
})
}
}
func TestActionNames(t *testing.T) {
// These names MUST exist
names := []string{