summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2020-12-30 01:51:25 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2020-12-30 18:39:17 +0900
commit0de7ab18f64db7838c8ca06d08188f976cbfdbb4 (patch)
tree65de1c044098b491d8cc1979a25a214681f03887 /src
parente9bc7331bde238e84f24b76ebb1f5e18799b15c4 (diff)
Add "last" action to move the cursor to the last match
This is the opposite of "first" (previously known as "top").
Diffstat (limited to 'src')
-rw-r--r--src/options.go6
-rw-r--r--src/options_test.go4
-rw-r--r--src/terminal.go8
3 files changed, 12 insertions, 6 deletions
diff --git a/src/options.go b/src/options.go
index f5a7c614..5eff033f 100644
--- a/src/options.go
+++ b/src/options.go
@@ -879,8 +879,10 @@ func parseKeymap(keymap map[int][]action, str string) {
appendAction(actDown)
case "up":
appendAction(actUp)
- case "top":
- appendAction(actTop)
+ case "first", "top":
+ appendAction(actFirst)
+ case "last":
+ appendAction(actLast)
case "page-up":
appendAction(actPageUp)
case "page-down":
diff --git a/src/options_test.go b/src/options_test.go
index a8fc75bd..5cc11c85 100644
--- a/src/options_test.go
+++ b/src/options_test.go
@@ -246,7 +246,7 @@ func TestBind(t *testing.T) {
"f1:execute(ls {+})+abort+execute(echo {+})+select-all,f2:execute/echo {}, {}, {}/,f3:execute[echo '({})'],f4:execute;less {};,"+
"alt-a:execute-Multi@echo (,),[,],/,:,;,%,{}@,alt-b:execute;echo (,),[,],/,:,@,%,{};,"+
"x:Execute(foo+bar),X:execute/bar+baz/"+
- ",f1:+top,f1:+top"+
+ ",f1:+first,f1:+top"+
",,:abort,::accept,+:execute:++\nfoobar,Y:execute(baz)+up")
check(tui.CtrlA, "", actKillLine)
check(tui.CtrlB, "", actToggleSort, actUp, actDown)
@@ -254,7 +254,7 @@ func TestBind(t *testing.T) {
check(tui.AltZ+',', "", actAbort)
check(tui.AltZ+':', "", actAccept)
check(tui.AltZ, "", actPageDown)
- check(tui.F1, "ls {+}", actExecute, actAbort, actExecute, actSelectAll, actTop, actTop)
+ check(tui.F1, "ls {+}", actExecute, actAbort, actExecute, actSelectAll, actFirst, actFirst)
check(tui.F2, "echo {}, {}, {}", actExecute)
check(tui.F3, "echo '({})'", actExecute)
check(tui.F4, "less {}", actExecute)
diff --git a/src/terminal.go b/src/terminal.go
index ec85ae99..2bba9c21 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -265,7 +265,8 @@ const (
actExecuteSilent
actExecuteMulti // Deprecated
actSigStop
- actTop
+ actFirst
+ actLast
actReload
)
@@ -2366,9 +2367,12 @@ func (t *Terminal) Loop() {
t.version++
req(reqList, reqInfo)
}
- case actTop:
+ case actFirst:
t.vset(0)
req(reqList)
+ case actLast:
+ t.vset(t.merger.Length() - 1)
+ req(reqList)
case actUnixLineDiscard:
beof = len(t.input) == 0
if t.cx > 0 {