1
1
mirror of https://github.com/mawww/kakoune.git synced 2024-08-17 00:30:26 +03:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Willow
86404d22a9
Merge 8bc8949de7 into 80fcfebca8 2024-06-27 08:27:15 +00:00
Maxime Coste
80fcfebca8 Fix order of evaluation issue when compiling regex alternations
The previous implementation was relying on the left hand side of the
assignement's side effects to be sequenced before the right hand side
evaluation (so --split_pos was expected to have taken place)

This is actually counter to C++17 which guarantees evaluation of the
right hand side of the assignement first. For some reason this is
not the case with GCC on linux.
2024-06-26 22:38:01 +10:00
Maxime Coste
cbdd200e73 Fix corner case in passin arguments to grep and make 2024-06-26 20:35:34 +10:00
Willow Barraco
8bc8949de7
autowrap: automatically set autowrap column highlighter
Also the user now can change the value, without duplicating the column.
2024-06-23 11:07:25 +02:00
5 changed files with 17 additions and 5 deletions

View File

@ -50,7 +50,6 @@ define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file
if (max_line_length && max_line_length != "off") {
print "set window autowrap_column " max_line_length
print "autowrap-enable"
print "add-highlighter window/ column %sh{ echo $((" max_line_length "+1)) } default,bright-black"
}
}
' ;;

View File

@ -1,5 +1,5 @@
declare-option -docstring "maximum amount of characters per line, after which a newline character will be inserted" \
int autowrap_column 80
int autowrap_column 0
declare-option -docstring %{
when enabled, paragraph formatting will reformat the whole paragraph in which characters are being inserted
@ -48,3 +48,13 @@ define-command autowrap-enable -docstring "Automatically wrap the lines in which
define-command autowrap-disable -docstring "Disable automatic line wrapping" %{
remove-hooks window autowrap
}
hook global WinSetOption autowrap_column=0 %{
try %{
remove-highlighter window/autowrap_column
}
}
hook global WinSetOption autowrap_column=(?!0).* %{
add-highlighter -override window/autowrap_column column %sh{ echo $((kak_opt_autowrap_column+1)) } default,bright-black
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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);