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

Rename _grep_current_line option to grep_current_line

Browse Source
This commit is contained in:
Maxime Coste 2017-06-03 14:04:06 +01:00
parent 58dfd76dca
commit 9d71be769b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rc/core/grep.kak
View File

@ -2,7 +2,7 @@ decl -docstring "shell command run to search for subtext in a file/directory" \
str grepcmd 'grep -RHn' str grepcmd 'grep -RHn'
decl -docstring "name of the client in which utilities display information" \ decl -docstring "name of the client in which utilities display information" \
str toolsclient str toolsclient
decl -hidden int _grep_current_line 0 decl -hidden int grep_current_line 0
def -params .. -file-completion \ def -params .. -file-completion \
-docstring %{grep [<arguments>]: grep utility wrapper -docstring %{grep [<arguments>]: grep utility wrapper
@ -19,7 +19,7 @@ All the optional arguments are forwarded to the grep utility} \
printf %s\\n "eval -try-client '$kak_opt_toolsclient' %{ printf %s\\n "eval -try-client '$kak_opt_toolsclient' %{
edit! -fifo ${output} -scroll *grep* edit! -fifo ${output} -scroll *grep*
set buffer filetype grep set buffer filetype grep
set buffer _grep_current_line 0 set buffer grep_current_line 0
hook -group fifo buffer BufCloseFifo .* %{ hook -group fifo buffer BufCloseFifo .* %{
nop %sh{ rm -r $(dirname ${output}) } nop %sh{ rm -r $(dirname ${output}) }
remove-hooks buffer fifo remove-hooks buffer fifo
@ -30,7 +30,7 @@ All the optional arguments are forwarded to the grep utility} \
hook -group grep-highlight global WinSetOption filetype=grep %{ hook -group grep-highlight global WinSetOption filetype=grep %{
add-highlighter group grep add-highlighter group grep
add-highlighter -group grep regex "^((?:\w:)?[^:]+):(\d+):(\d+)?" 1:cyan 2:green 3:green add-highlighter -group grep regex "^((?:\w:)?[^:]+):(\d+):(\d+)?" 1:cyan 2:green 3:green
add-highlighter -group grep line %{%opt{_grep_current_line}} default+b add-highlighter -group grep line %{%opt{grep_current_line}} default+b
} }
hook global WinSetOption filetype=grep %{ hook global WinSetOption filetype=grep %{
@ -50,7 +50,7 @@ def -hidden grep-jump %{
eval -collapse-jumps %{ eval -collapse-jumps %{
try %{ try %{
exec 'xs^((?:\w:)?[^:]+):(\d+):(\d+)?<ret>' exec 'xs^((?:\w:)?[^:]+):(\d+):(\d+)?<ret>'
set buffer _grep_current_line %val{cursor_line} set buffer grep_current_line %val{cursor_line}
eval -try-client %opt{jumpclient} edit -existing %reg{1} %reg{2} %reg{3} eval -try-client %opt{jumpclient} edit -existing %reg{1} %reg{2} %reg{3}
try %{ focus %opt{jumpclient} } try %{ focus %opt{jumpclient} }
} }
@ -60,17 +60,17 @@ def -hidden grep-jump %{
def grep-next -docstring 'Jump to the next grep match' %{ def grep-next -docstring 'Jump to the next grep match' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*grep*' buffer '*grep*'
exec "%opt{_grep_current_line}g<a-l>/^[^:]+:\d+:<ret>" exec "%opt{grep_current_line}g<a-l>/^[^:]+:\d+:<ret>"
grep-jump grep-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_grep_current_line}g } } try %{ eval -client %opt{toolsclient} %{ exec %opt{grep_current_line}g } }
} }
def grep-prev -docstring 'Jump to the previous grep match' %{ def grep-prev -docstring 'Jump to the previous grep match' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*grep*' buffer '*grep*'
exec "%opt{_grep_current_line}g<a-/>^[^:]+:\d+:<ret>" exec "%opt{grep_current_line}g<a-/>^[^:]+:\d+:<ret>"
grep-jump grep-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_grep_current_line}g } } try %{ eval -client %opt{toolsclient} %{ exec %opt{grep_current_line}g } }
} }