Merge 161b9e741a into 374a7a8c99

Throwing early avoids losing selections in this case.

doc/pages/highlighters.asciidoc

@@ -41,22 +41,27 @@ highlighter is replaced with the new one.
     using the `Whitespace` face, with the following *options*:
 
     *-lf* <separator>:::
-        a one character long separator that will replace line feeds
+        a one character long separator that will replace line feeds,
+        or an empty string to ignore them.
 
     *-spc* <separator>:::
-        a one character long separator that will replace spaces
+        a one character long separator that will replace spaces,
+        or an empty string to ignore them.
 
     *-nbsp* <separator>:::
-        a one character long separator that will replace non-breakable spaces
+        a one character long separator that will replace non-breakable spaces,
+        or an empty string to ignore them.
 
     *-tab* <separator>:::
-        a one character long separator that will replace tabulations
+        a one character long separator that will replace tabulations,
+        or an empty string to ignore them.
 
     *-tabpad* <separator>:::
         a one character long separator that will be appended to tabulations to honor the *tabstop* option
 
     *-indent* <separator>:::
-        a one character long separator that will replace the first space in indentation according to the *indentwidth* option
+        a one character long separator that will replace the first space in indentation 
+        according to the *indentwidth* option, or an empty string to ignore them.
         This will use the `WhitespaceIndent` face.
 
     *-only-trailing*:::

doc/pages/options.asciidoc

@@ -381,6 +381,10 @@ are exclusively available to built-in options.
             set the maximum allowable width of an info box. set to zero for
             no limit.
 
+        *terminal_info_inline_borders*:::
+            if *yes* or *true*, borders will be drawn around info boxes with the
+            *inline* style.
+
 [[startup-info]]
 *startup_info_version* `int`::
     _default_ 0 +

rc/filetype/elixir.kak

@@ -8,7 +8,7 @@ hook global BufCreate .*[.](ex|exs) %{
     set-option buffer filetype elixir
 }
 
-hook global BufCreate .*[.]html[.]l?eex %{
+hook global BufCreate .*[.]html[.][lh]?eex %{
     set-option buffer filetype eex
 }
 
@@ -64,6 +64,7 @@ add-highlighter shared/elixir/single_string region "'" "(?<!\\)(?:\\\\)*'" fill
 add-highlighter shared/elixir/comment region '#' '$' fill comment
 
 add-highlighter shared/elixir/leex region -match-capture '~L("""|")' '(?<!\\)(?:\\\\)*("""|")' ref eex
+add-highlighter shared/elixir/heex region -match-capture '~H("""|")' '(?<!\\)(?:\\\\)*("""|")' ref eex
 
 add-highlighter shared/elixir/double_string/base default-region fill string
 add-highlighter shared/elixir/double_string/interpolation region -recurse \{ \Q#{ \} fill builtin

rc/tools/fifo.kak

@@ -1,12 +1,14 @@
 provide-module fifo %{
 
 define-command -params .. -docstring %{
-    fifo [-name <buffer-name>] [-scroll] [--] <command>...: run command in a fifo buffer
+    fifo [-name <name>] [-scroll] [-script <script>] [--] <args>...: run command in a fifo buffer
+    if <script> is used, eval it with <args> as '$@', else pass arguments directly to the shell
 } fifo %{ evaluate-commands %sh{
     name='*fifo*'
     while true; do
         case "$1" in
             "-scroll") scroll="-scroll"; shift ;;
+            "-script") script="$2"; shift 2 ;;
             "-name") name="$2"; shift 2 ;;
             "--") shift; break ;;
             *) break ;;
@@ -14,7 +16,11 @@ define-command -params .. -docstring %{
     done
     output=$(mktemp -d "${TMPDIR:-/tmp}"/kak-fifo.XXXXXXXX)/fifo
     mkfifo ${output}
-    ( eval "$@" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
+    if [ -n "$script" ]; then
+        ( eval "$script" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
+    else
+        ( "$@" > ${output} 2>&1 & ) > /dev/null 2>&1 < /dev/null
+    fi
 
     printf %s\\n "
             edit! -fifo ${output} ${scroll} ${name}

rc/tools/grep.kak

@@ -12,8 +12,7 @@ define-command -params .. -docstring %{
     Passing no argument will perform a literal-string grep for the current selection
 } grep %{
     evaluate-commands -try-client %opt{toolsclient} %{
-        fifo -name *grep* %{
-            shift 2
+        fifo -name *grep* -script %{
             trap - INT QUIT
             if [ $# -eq 0 ]; then
                 case "$kak_opt_grepcmd" in
@@ -29,7 +28,7 @@ define-command -params .. -docstring %{
                 esac
             fi
             $kak_opt_grepcmd "$@" 2>&1 | tr -d '\r'
-        } 'exit;' %arg{@} # pass arguments for "$@" above, exit to avoid evaluating them
+        } %arg{@}
         set-option buffer filetype grep
         set-option buffer jump_current_line 0
     }

rc/tools/make.kak

@@ -13,11 +13,10 @@ define-command -params .. -docstring %{
     All the optional arguments are forwarded to the make utility
 } make %{
     evaluate-commands -try-client %opt{toolsclient} %{
-        fifo -scroll -name *make* %{
-            shift 2
+        fifo -scroll -name *make* -script %{
             trap - INT QUIT
             $kak_opt_makecmd "$@"
-        } 'exit;' %arg{@} # pass arguments for "$@" above, exit to avoid evaluating them
+        } %arg{@} # pass arguments for "$@" above, exit to avoid evaluating them
         set-option buffer filetype make
         set-option buffer jump_current_line 0
     }

src/context.cc

@@ -424,7 +424,7 @@ StringView Context::main_sel_register_value(StringView reg) const
     return RegisterManager::instance()[reg].get_main(*this, index);
 }
 
-void Context::set_name(String name) { 
+void Context::set_name(String name) {
     String old_name = std::exchange(m_name, std::move(name));
     hooks().run_hook(Hook::ClientRenamed, format("{}:{}", old_name, m_name), *this);
 }

src/hash_map.hh

@@ -239,7 +239,7 @@ struct HashMap
     constexpr bool contains(const KeyType& key) const { return find_index(key) >= 0; }
 
     template<typename KeyType> requires IsHashCompatible<Key, std::remove_cvref_t<KeyType>>
-    constexpr EffectiveValue& operator[](KeyType&& key) 
+    constexpr EffectiveValue& operator[](KeyType&& key)
     {
         const auto hash = hash_value(key);
         auto index = find_index(key, hash);

src/highlighters.cc

@@ -981,18 +981,14 @@ struct ShowWhitespacesHighlighter : Highlighter
         bool only_trailing = (bool) parser.get_switch("only-trailing");
         auto get_param = [&](StringView param,  StringView fallback) {
             StringView value = parser.get_switch(param).value_or(fallback);
-            if (value.char_length() != 1)
-                throw runtime_error{format("-{} expects a single character parameter", param)};
+            if (value.char_length() > 1)
+                throw runtime_error{format("-{} expects a single character or empty parameter", param)};
             return value.str();
         };
 
-        String indent = parser.get_switch("indent").value_or("│").str();
-        if (indent.char_length() > 1)
-            throw runtime_error{format("-indent expects a single character or empty parameter")};
-
         return std::make_unique<ShowWhitespacesHighlighter>(
             get_param("tab", "→"), get_param("tabpad", " "), get_param("spc", "·"),
-            get_param("lf", "¬"), get_param("nbsp", "⍽"), indent, only_trailing);
+            get_param("lf", "¬"), get_param("nbsp", "⍽"), get_param("indent", "│"), only_trailing);
     }
 
 private:
@@ -1043,28 +1039,28 @@ private:
                         if (it != end)
                             atom_it = line.split(atom_it, it.coord());
 
-                        if (cp == '\t')
+                        if (cp == '\t' and not m_tab.empty() and not m_tabpad.empty())
                         {
                             const ColumnCount column = get_column(buffer, tabstop, coord);
                             const ColumnCount count = tabstop - (column % tabstop);
                             atom_it->replace(m_tab + String(m_tabpad[(CharCount)0], count - m_tab.column_length()));
                         }
-                        else if (cp == ' ') {
-                            if (m_indent.empty() or indentwidth == 0 or not is_indentation) {
+                        else if (cp == ' ' and is_indentation and indentwidth > 0 and not m_indent.empty()) {
+                            const ColumnCount column = get_column(buffer, tabstop, coord);
+                            if (column % indentwidth == 0 and column != 0) {
+                                atom_it->replace(m_indent);
+                                face = indentface;
+                            }
+                            else {
                                 atom_it->replace(m_spc);
-                            } else {
-                                const ColumnCount column = get_column(buffer, tabstop, coord);
-                                if (column % indentwidth == 0 and column != 0) {
-                                    atom_it->replace(m_indent);
-                                    face = indentface;
-                                } else  {
-                                    atom_it->replace(m_spc);
-                                }
                             }
                         }
-                        else if (cp == '\n')
+                        else if (cp == ' ' and not m_spc.empty()) {
+                            atom_it->replace(m_spc);
+                        }
+                        else if (cp == '\n' and not m_lf.empty())
                             atom_it->replace(m_lf);
-                        else if (cp == 0xA0 or cp == 0x202F)
+                        else if ((cp == 0xA0 or cp == 0x202F) and not m_nbsp.empty())
                             atom_it->replace(m_nbsp);
                         atom_it->face = merge_faces(atom_it->face, face);
                         break;

src/main.cc

@@ -600,7 +600,8 @@ void register_options()
                        "    terminal_shift_function_key    int\n"
                        "    terminal_padding_char          codepoint\n"
                        "    terminal_padding_fill          bool\n"
-                       "    terminal_info_max_width        int\n",
+                       "    terminal_info_max_width        int\n"
+                       "    terminal_info_inline_borders   bool\n",
                        UserInterface::Options{});
     reg.declare_option("modelinefmt", "format string used to generate the modeline",
                        "%val{bufname} %val{cursor_line}:%val{cursor_char_column} {{context_info}} {{mode_info}} - %val{client}@[%val{session}]"_str);

src/normal.cc

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

src/register_manager.cc

@@ -40,7 +40,7 @@ void HistoryRegister::set(Context& context, ConstArrayView<String> values, bool
         return;
     }
 
-    for (auto&& entry : values | reverse()) 
+    for (auto&& entry : values | reverse())
     {
         m_content.erase(std::remove(m_content.begin(), m_content.end(), entry), m_content.end());
         m_content.insert(m_content.begin(), entry);

src/string.cc

@@ -6,7 +6,7 @@
 
 namespace Kakoune
 {
-namespace 
+namespace
 {
 // Avoid including all of <algorithm> just for this.
 constexpr auto max(auto lhs, auto rhs) { return lhs > rhs ? lhs : rhs;}
@@ -69,7 +69,7 @@ void String::Data::reserve(size_t new_capacity)
     if (current_capacity != 0 and new_capacity <= current_capacity)
         return;
 
-    if (!is_long() and new_capacity <= Short::capacity) 
+    if (!is_long() and new_capacity <= Short::capacity)
         return;
 
     kak_assert(new_capacity <= Long::max_capacity);

src/string.hh

@@ -169,9 +169,9 @@ public:
         using Alloc = Allocator<char, MemoryDomain::String>;
 
         Data() { set_empty(); }
-        Data(NoCopy, const char* data, size_t size) : u{Long{const_cast<char*>(data), 
+        Data(NoCopy, const char* data, size_t size) : u{Long{const_cast<char*>(data),
                                                              size,
-                                                             /*capacity=*/0, 
+                                                             /*capacity=*/0,
                                                              /*mode=*/Long::active_mask}} {}
 
         Data(const char* data, size_t size, size_t capacity);

src/string_utils.cc

@@ -202,7 +202,7 @@ InplaceString<23> to_string(Grouped val)
     InplaceString<23> res;
     for (int pos = 0, len = ungrouped.m_length; pos != len; ++pos)
     {
-        if (res.m_length and ((len - pos) % 3) == 0) 
+        if (res.m_length and ((len - pos) % 3) == 0)
             res.m_data[res.m_length++] = ',';
         res.m_data[res.m_length++] = ungrouped.m_data[pos];
     }

src/string_utils.hh

@@ -144,10 +144,10 @@ decltype(auto) to_string(const StronglyTypedNumber<RealType, ValueType>& val)
 namespace detail
 {
 
-template<typename T> requires std::is_convertible_v<T, StringView> 
+template<typename T> requires std::is_convertible_v<T, StringView>
 StringView format_param(const T& val) { return val; }
 
-template<typename T> requires (not std::is_convertible_v<T, StringView>) 
+template<typename T> requires (not std::is_convertible_v<T, StringView>)
 decltype(auto) format_param(const T& val) { return to_string(val); }
 
 }

src/terminal_ui.cc

@@ -377,7 +377,7 @@ void TerminalUI::Screen::output(bool force, bool synchronized, Writer& writer)
     {
         for (int line = 0; line < (int)size.line; ++line)
         {
-            auto hash = hash_line(lines[line]); 
+            auto hash = hash_line(lines[line]);
             if (hash == hashes[line])
                 continue;
             hashes[line] = hash;
@@ -1300,7 +1300,7 @@ void TerminalUI::info_show(const DisplayLine& title, const DisplayLineList& cont
     m_info.face = face;
     m_info.style = style;
 
-    const bool framed = style == InfoStyle::Prompt or style == InfoStyle::Modal;
+    const bool framed = style == InfoStyle::Prompt or style == InfoStyle::Modal or m_info_inline_borders;
     const bool assisted = style == InfoStyle::Prompt and m_assistant.size() != 0;
 
     DisplayCoord max_size = m_dimensions;
@@ -1555,6 +1555,7 @@ void TerminalUI::set_ui_options(const Options& options)
     m_padding_fill = find("terminal_padding_fill").map(to_bool).value_or(false);
 
     m_info_max_width = find("terminal_info_max_width").map(str_to_int_ifp).value_or(0);
+    m_info_inline_borders = find("terminal_info_inline_borders").map(to_bool).value_or(false);
 }
 
 }

src/terminal_ui.hh

@@ -175,6 +175,7 @@ private:
 
     ColumnCount m_status_len = 0;
     ColumnCount m_info_max_width = 0;
+    bool m_info_inline_borders = false;
 };
 
 }