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

Cleanup make.kak and optimize the make-next/make-prev regexes

Browse Source
This commit is contained in:
Maxime Coste 2016-12-09 13:33:01 +00:00
parent 5caa969947
commit ca225ad4dc
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rc/core/make.kak
View File

@ -2,7 +2,7 @@ decl str makecmd make
decl str make_error_pattern " (?:fatal )?error:" decl str make_error_pattern " (?:fatal )?error:"
decl str toolsclient decl str toolsclient
decl -hidden int _make_current_error_line decl -hidden int make_current_error_line
def -params .. \ def -params .. \
-docstring %{make [<arguments>]: make utility wrapper -docstring %{make [<arguments>]: make utility wrapper
@ -15,7 +15,7 @@ All the optional arguments are forwarded to the make utility} \
printf %s\\n "eval -try-client '$kak_opt_toolsclient' %{ printf %s\\n "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 set buffer make_current_error_line 0
hook -group fifo buffer BufCloseFifo .* %{ hook -group fifo buffer BufCloseFifo .* %{
nop %sh{ rm -r $(dirname ${output}) } nop %sh{ rm -r $(dirname ${output}) }
rmhooks buffer fifo rmhooks buffer fifo
@ -25,7 +25,7 @@ All the optional arguments are forwarded to the make utility} \
addhl -group / group make addhl -group / group make
addhl -group /make regex "^((?:\w:)?[^:\n]+):(\d+):(?:(\d+):)?\h+(?:((?:fatal )?error)|(warning)|(note)|(required from(?: here)?))?.*?$" 1:cyan 2:green 3:green 4:red 5:yellow 6:blue 7:yellow addhl -group /make regex "^((?:\w:)?[^:\n]+):(\d+):(?:(\d+):)?\h+(?:((?:fatal )?error)|(warning)|(note)|(required from(?: here)?))?.*?$" 1:cyan 2:green 3:green 4:red 5:yellow 6:blue 7:yellow
addhl -group /make line %{%opt{_make_current_error_line}} default+b addhl -group /make line '%opt{make_current_error_line}' default+b
hook -group make-highlight global WinSetOption filetype=make %{ addhl ref make } hook -group make-highlight global WinSetOption filetype=make %{ addhl ref make }
@ -46,14 +46,12 @@ def -hidden make-jump %{
try %{ try %{
exec gl<a-?> "Entering directory" <ret> exec gl<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} set buffer make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information %{%reg{5}}" eval -try-client %opt{jumpclient} "edit -existing %reg{1}/%reg{2} %reg{3} %reg{4}; echo -color Information %{%reg{5}}; try %{ focus }"
try %{ focus %opt{jumpclient} }
} catch %{ } catch %{
exec <a-h><a-l> s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l exec <a-h><a-l> s "((?:\w:)?[^:]+):(\d+):(?:(\d+):)?([^\n]+)\'" <ret>l
set buffer _make_current_error_line %val{cursor_line} set buffer make_current_error_line %val{cursor_line}
eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information %{%reg{4}}" eval -try-client %opt{jumpclient} "edit -existing %reg{1} %reg{2} %reg{3}; echo -color Information %{%reg{4}}; try %{ focus }"
try %{ focus %opt{jumpclient} }
} }
} }
} }
@ -61,17 +59,17 @@ def -hidden make-jump %{
def make-next -docstring 'Jump to the next make error' %{ def make-next -docstring 'Jump to the next make error' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*make*' buffer '*make*'
exec "%opt{_make_current_error_line}g<a-l>/(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>" exec "%opt{make_current_error_line}ggl" "/^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"
make-jump make-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } } try %{ eval -client %opt{toolsclient} %{ exec %opt{make_current_error_line}g } }
} }
def make-prev -docstring 'Jump to the previous make error' %{ def make-prev -docstring 'Jump to the previous make error' %{
eval -collapse-jumps -try-client %opt{jumpclient} %{ eval -collapse-jumps -try-client %opt{jumpclient} %{
buffer '*make*' buffer '*make*'
exec "%opt{_make_current_error_line}g<a-h><a-/>(?:\w:)?[^:]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>" exec "%opt{make_current_error_line}g" "<a-/>^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"
make-jump make-jump
} }
try %{ eval -client %opt{toolsclient} %{ exec %opt{_make_current_error_line}g } } try %{ eval -client %opt{toolsclient} %{ exec %opt{make_current_error_line}g } }
} }