make.kak: Add :errnext and :errprev for jumping between errors

This commit is contained in:
Maxime Coste 2014-06-18 19:30:40 +01:00
parent 9aa8c8a60a
commit a5ff40c107

View File

@ -1,5 +1,6 @@
decl str makecmd make decl str makecmd make
decl str toolsclient decl str toolsclient
decl -hidden int _make_current_error_line
def -shell-params make %{ %sh{ def -shell-params make %{ %sh{
output=$(mktemp -d -t kak-make.XXXXXXXX)/fifo output=$(mktemp -d -t kak-make.XXXXXXXX)/fifo
@ -9,6 +10,7 @@ def -shell-params make %{ %sh{
echo "eval -try-client '$kak_opt_toolsclient' %{ echo "eval -try-client '$kak_opt_toolsclient' %{
edit! -fifo ${output} -scroll *make* edit! -fifo ${output} -scroll *make*
set buffer filetype make set buffer filetype make
set buffer _make_current_error_line 0
hook buffer BufCloseFifo .* %{ nop %sh{ rm -r $(dirname ${output}) } } hook buffer BufCloseFifo .* %{ nop %sh{ rm -r $(dirname ${output}) } }
}" }"
}} }}
@ -29,11 +31,29 @@ def errjump -docstring 'Jump to error location' %{
try %{ try %{
exec gll<a-?> "Entering directory" <ret> exec gll<a-?> "Entering directory" <ret>
exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(\d+):([^\n]+)\'" <ret>l exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(\d+):([^\n]+)\'" <ret>l
set buffer _make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} %rec{edit %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information '%reg{5}'} eval -try-client %opt{jumpclient} %rec{edit %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information '%reg{5}'}
try %{ focus %opt{jumpclient} } try %{ focus %opt{jumpclient} }
} catch %{ } catch %{
exec ghgl s "([^:]+):(\d+):(\d+):([^\n]+)\'" <ret>l exec ghgl s "([^:]+):(\d+):(\d+):([^\n]+)\'" <ret>l
set buffer _make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} %rec{edit %reg{1} %reg{2} %reg{3}; echo -color Information '%reg{4}'} eval -try-client %opt{jumpclient} %rec{edit %reg{1} %reg{2} %reg{3}; echo -color Information '%reg{4}'}
try %{ focus %opt{jumpclient} } try %{ focus %opt{jumpclient} }
} }
} }
def errnext -docstring 'Jump to next error' %{
eval -try-client %opt{jumpclient} %{
buffer '*make*'
exec %rec{%opt{_make_current_error_line}ggl/[0-9]+: error:<ret>}
errjump
}
}
def errprev -docstring 'Jump to previous error' %{
eval -try-client %opt{jumpclient} %{
buffer '*make*'
exec %rec{%opt{_make_current_error_line}ggh<a-/>[0-9]+: error:<ret>}
errjump
}
}