xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix grep-next/prev-match not jumping correctly to first/last match

Browse Source 
When used just after grepping, grep-next-match ended up jumping to
the second match, as `0g` is the same as `g`.

The fix itself is pretty ugly, a better one might be to distinguish
the `0` count from no count given, so that `0g` could fail with
"no such line" or similar.
This commit is contained in:
Maxime Coste 2017-07-28 20:19:58 +02:00
parent 6ab98f8bf8
commit 4dac61c864
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rc/core/grep.kak
View File

@ -60,17 +60,21 @@ def -hidden grep-jump %{
def grep-next-match -docstring 'Jump to the next grep match' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*grep*'
exec "%opt{grep_current_line}g<a-l>/^[^:]+:\d+:<ret>"
# First jump to enf of buffer so that if grep_current_line == 0
# 0g<a-l> will be a no-op and we'll jump to the first result.
# Yeah, thats ugly...
exec "ge %opt{grep_current_line}g<a-l> /^[^:]+:\d+:<ret>"
grep-jump
}
try %{ eval -client %opt{toolsclient} %{ exec %opt{grep_current_line}g } }
try %{ eval -client %opt{toolsclient} %{ exec gg %opt{grep_current_line}g } }
}
def grep-previous-match -docstring 'Jump to the previous grep match' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*grep*'
exec "%opt{grep_current_line}g<a-/>^[^:]+:\d+:<ret>"
# See comment in grep-next-match
exec "ge %opt{grep_current_line}g<a-h> <a-/>^[^:]+:\d+:<ret>"
grep-jump
}
try %{ eval -client %opt{toolsclient} %{ exec %opt{grep_current_line}g } }
try %{ eval -client %opt{toolsclient} %{ exec gg %opt{grep_current_line}g } }
}