mirror of
https://github.com/mawww/kakoune.git
synced 2024-08-17 00:30:26 +03:00
Compare commits
6 Commits
af35cb348a
...
cbca6f11ae
Author | SHA1 | Date | |
---|---|---|---|
|
cbca6f11ae | ||
|
80fcfebca8 | ||
|
cbdd200e73 | ||
|
edafb6b968 | ||
|
7519871aec | ||
|
e1e6a76b84 |
@ -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
|
||||
}
|
||||
|
@ -2,6 +2,8 @@ declare-option -docstring "name of the client in which all source code jumps wil
|
||||
str jumpclient
|
||||
declare-option -docstring "name of the client in which utilities display information" \
|
||||
str toolsclient
|
||||
declare-option -docstring "the pattern for the jump information in the line, such as file:line:col" \
|
||||
str jump_pattern "^([^:\n]+)(?::(\d+))(?::(\d+))?"
|
||||
|
||||
provide-module jump %{
|
||||
|
||||
@ -11,7 +13,7 @@ define-command -hidden jump %{
|
||||
evaluate-commands -save-regs a %{ # use evaluate-commands to ensure jumps are collapsed
|
||||
try %{
|
||||
evaluate-commands -draft %{
|
||||
execute-keys ',xs^([^:\n]+):(\d+):(\d+)?<ret>'
|
||||
execute-keys ",xs%opt{jump_pattern}<ret>"
|
||||
set-register a %reg{1} %reg{2} %reg{3}
|
||||
}
|
||||
set-option buffer jump_current_line %val{cursor_line}
|
||||
@ -41,7 +43,10 @@ define-command -hidden jump-select-next %{
|
||||
# First jump to end of buffer so that if jump_current_line == 0
|
||||
# 0g<a-l> will be a no-op and we'll jump to the first result.
|
||||
# Yeah, thats ugly...
|
||||
execute-keys ge %opt{jump_current_line}g<a-l> /^[^:\n]+:\d+:<ret>
|
||||
evaluate-commands -save-regs / %{
|
||||
set-register / %opt{jump_pattern}
|
||||
execute-keys ge %opt{jump_current_line}g<a-l>/<ret>
|
||||
}
|
||||
}
|
||||
|
||||
define-command jump-previous -params 1.. -docstring %{
|
||||
@ -62,7 +67,10 @@ define-command jump-previous -params 1.. -docstring %{
|
||||
complete-command jump-previous buffer
|
||||
define-command -hidden jump-select-previous %{
|
||||
# See comment in jump-select-next
|
||||
execute-keys ge %opt{jump_current_line}g<a-h> <a-/>^[^:\n]+:\d+:<ret>
|
||||
evaluate-commands -save-regs / %{
|
||||
set-register / %opt{jump_pattern}
|
||||
execute-keys ge %opt{jump_current_line}g<a-h> <a-/><ret>
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ define-command -params .. -docstring %{
|
||||
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
|
||||
}
|
||||
|
@ -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