mirror of
https://github.com/mawww/kakoune.git
synced 2024-08-16 16:20:38 +03:00
Compare commits
8 Commits
ee093422d9
...
05b941f0f0
Author | SHA1 | Date | |
---|---|---|---|
|
05b941f0f0 | ||
|
80fcfebca8 | ||
|
cbdd200e73 | ||
|
6cdd1c083f | ||
|
e54932cb39 | ||
|
e5e7930397 | ||
|
94261eb4cf | ||
|
dc9cc5be0c |
@ -28,7 +28,7 @@ define-command -params .. -docstring %{
|
||||
esac
|
||||
fi
|
||||
$kak_opt_grepcmd "$@" 2>&1 | tr -d '\r'
|
||||
} %arg{@}
|
||||
} -- %arg{@}
|
||||
set-option buffer filetype grep
|
||||
set-option buffer jump_current_line 0
|
||||
}
|
||||
|
@ -12,22 +12,24 @@ define-command -params .. -docstring %{
|
||||
make [<arguments>]: make utility wrapper
|
||||
All the optional arguments are forwarded to the make utility
|
||||
} make %{
|
||||
evaluate-commands -try-client %opt{toolsclient} %{
|
||||
evaluate-commands -try-client %opt{toolsclient} -save-regs a %{
|
||||
set-register a %opt{make_error_pattern} # save current error_pattern
|
||||
fifo -scroll -name *make* -script %{
|
||||
trap - INT QUIT
|
||||
$kak_opt_makecmd "$@"
|
||||
} %arg{@} # pass arguments for "$@" above, exit to avoid evaluating them
|
||||
} -- %arg{@}
|
||||
set-option buffer filetype make
|
||||
set-option buffer jump_current_line 0
|
||||
set-option buffer make_error_pattern %reg{a} # set the pattern to the value while firing the make command
|
||||
}
|
||||
}
|
||||
|
||||
add-highlighter shared/make group
|
||||
add-highlighter shared/make/ regex "^([^:\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
|
||||
add-highlighter shared/make/ regex "^\h*(~*(?:(\^)~*)?)$" 1:green 2:cyan+b
|
||||
add-highlighter shared/make/ line '%opt{jump_current_line}' default+b
|
||||
|
||||
hook -group make-highlight global WinSetOption filetype=make %{
|
||||
add-highlighter -override shared/make/ regex %opt{make_error_pattern} 1:cyan 2:green 3:green 4:red 5:yellow 6:blue 7:yellow
|
||||
add-highlighter window/make ref make
|
||||
hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/make }
|
||||
}
|
||||
|
@ -753,7 +753,10 @@ private:
|
||||
{
|
||||
auto node = compile_node<direction>(child);
|
||||
if (child != index+1)
|
||||
m_program.instructions[--split_pos].param.split = CompiledRegex::Param::Split{.offset = offset(node, split_pos), .prioritize_parent = true};
|
||||
{
|
||||
--split_pos;
|
||||
m_program.instructions[split_pos].param.split = {.offset = offset(node, split_pos), .prioritize_parent = true};
|
||||
}
|
||||
if (get_node(child).children_end != end)
|
||||
{
|
||||
auto jump = push_inst(CompiledRegex::Jump);
|
||||
|
Loading…
Reference in New Issue
Block a user