From a5ff40c10716f3e5ef0de8536b5b436c47162975 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 18 Jun 2014 19:30:40 +0100 Subject: [PATCH] make.kak: Add :errnext and :errprev for jumping between errors --- rc/make.kak | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rc/make.kak b/rc/make.kak index 38850b64..91de2f70 100644 --- a/rc/make.kak +++ b/rc/make.kak @@ -1,5 +1,6 @@ decl str makecmd make decl str toolsclient +decl -hidden int _make_current_error_line def -shell-params make %{ %sh{ output=$(mktemp -d -t kak-make.XXXXXXXX)/fifo @@ -9,6 +10,7 @@ def -shell-params make %{ %sh{ echo "eval -try-client '$kak_opt_toolsclient' %{ edit! -fifo ${output} -scroll *make* set buffer filetype make + set buffer _make_current_error_line 0 hook buffer BufCloseFifo .* %{ nop %sh{ rm -r $(dirname ${output}) } } }" }} @@ -29,11 +31,29 @@ def errjump -docstring 'Jump to error location' %{ try %{ exec gll "Entering directory" exec s "Entering directory '([^']+)'.*\n([^:]+):(\d+):(\d+):([^\n]+)\'" 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}'} try %{ focus %opt{jumpclient} } } catch %{ exec ghgl s "([^:]+):(\d+):(\d+):([^\n]+)\'" 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}'} 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:} + errjump + } +} + +def errprev -docstring 'Jump to previous error' %{ + eval -try-client %opt{jumpclient} %{ + buffer '*make*' + exec %rec{%opt{_make_current_error_line}ggh[0-9]+: error:} + errjump + } +}