mirror of
https://github.com/mawww/kakoune.git
synced 2024-08-17 00:30:26 +03:00
Compare commits
3 Commits
d568a5993d
...
844d499918
Author | SHA1 | Date | |
---|---|---|---|
|
844d499918 | ||
|
374a7a8c99 | ||
|
7a8fe7e6ff |
@ -4,6 +4,9 @@
|
||||
# Detection
|
||||
# ‾‾‾‾‾‾‾‾‾
|
||||
|
||||
declare-option -docstring "disable automatic edition of the buffer (wrap, trailing whitespaces)" \
|
||||
bool editorconfig_noedit false
|
||||
|
||||
hook global BufCreate .*[.](editorconfig) %{
|
||||
set-option buffer filetype ini
|
||||
set-option buffer static_words indent_style indent_size tab_width \
|
||||
@ -19,7 +22,7 @@ define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file
|
||||
case $file in
|
||||
/*) # $kak_buffile is a full path that starts with a '/'
|
||||
printf %s\\n "remove-hooks buffer editorconfig-hooks"
|
||||
editorconfig "$file" | awk -v file="$file" -F= -- '
|
||||
editorconfig "$file" | awk -v file="$file" -v noedit="$kak_opt_editorconfig_noedit" -F= -- '
|
||||
$1 == "indent_style" { indent_style = $2 }
|
||||
$1 == "indent_size" { indent_size = $2 == "tab" ? 4 : $2 }
|
||||
$1 == "tab_width" { tab_width = $2 }
|
||||
@ -44,13 +47,15 @@ define-command editorconfig-load -params ..1 -docstring "editorconfig-load [file
|
||||
if (charset == "utf-8-bom") {
|
||||
print "set-option buffer BOM utf8"
|
||||
}
|
||||
if (trim_trailing_whitespace == "true") {
|
||||
if (trim_trailing_whitespace == "true" && noedit == "false") {
|
||||
print "hook buffer BufWritePre \"" file "\" -group editorconfig-hooks %{ try %{ execute-keys -draft %{%s\\h+$|\\n+\\z<ret>d} } }"
|
||||
}
|
||||
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"
|
||||
if (noedit == "false") {
|
||||
print "autowrap-enable"
|
||||
}
|
||||
}
|
||||
}
|
||||
' ;;
|
||||
|
@ -589,13 +589,13 @@ void pipe(Context& context, NormalParams params)
|
||||
return;
|
||||
|
||||
Buffer& buffer = context.buffer();
|
||||
SelectionList selections = context.selections();
|
||||
if (replace)
|
||||
{
|
||||
buffer.throw_if_read_only();
|
||||
ScopedEdition edition(context);
|
||||
ForwardChangesTracker changes_tracker;
|
||||
size_t timestamp = buffer.timestamp();
|
||||
Vector<Selection> new_sels;
|
||||
SelectionList selections = context.selections();
|
||||
for (auto& sel : selections)
|
||||
{
|
||||
const auto beg = changes_tracker.get_new_coord_tolerant(sel.min());
|
||||
@ -614,20 +614,27 @@ void pipe(Context& context, NormalParams params)
|
||||
|
||||
auto new_end = apply_diff(buffer, beg, in, out);
|
||||
if (new_end != beg)
|
||||
new_sels.push_back(keep_direction({beg, buffer.char_prev(new_end), std::move(sel.captures())}, sel));
|
||||
{
|
||||
auto& min = sel.min();
|
||||
auto& max = sel.max();
|
||||
min = beg;
|
||||
max = buffer.char_prev(new_end);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (new_end != BufferCoord{})
|
||||
new_end = buffer.char_prev(new_end);
|
||||
new_sels.push_back({new_end, new_end, std::move(sel.captures())});
|
||||
sel.set(new_end);
|
||||
}
|
||||
|
||||
changes_tracker.update(buffer, timestamp);
|
||||
}
|
||||
context.selections_write_only().set(std::move(new_sels), selections.main_index());
|
||||
selections.force_timestamp(timestamp);
|
||||
context.selections_write_only() = std::move(selections);
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectionList& selections = context.selections();
|
||||
const auto old_main = selections.main_index();
|
||||
for (int i = 0; i < selections.size(); ++i)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user