Improve ergonomics of multiple grep/git buffers

src/buffer_utils.cc

@@ -5,6 +5,7 @@
 #include "file.hh"
 #include "selection.hh"
 #include "changes.hh"
+#include "utf8.hh"
 
 #include <unistd.h>
 
@@ -173,15 +174,28 @@ Buffer* create_fifo_buffer(String name, int fd, Buffer::Flags flags, bool scroll
     Buffer* buffer = buffer_manager.get_buffer_ifp(name);
     if (buffer)
     {
-        buffer->flags() |= Buffer::Flags::NoUndo | flags;
-        buffer->values().clear();
-        buffer->reload({StringData::create("\n")}, ByteOrderMark::None, EolFormat::Lf, {InvalidTime, {}, {}});
-        buffer_manager.make_latest(*buffer);
+        auto& name = buffer->name();
+        auto pos = name.end();
+        Codepoint codepoint = 0;
+        while (pos != name.begin())
+        {
+            utf8::to_previous(pos, name.begin());
+            codepoint = utf8::codepoint(pos, name.end());
+            if (codepoint != '*' and not isdigit(codepoint))
+                break;
+        }
+        String prefix = {name.begin(), pos + 1};
+        if (codepoint != '-')
+            prefix.push_back('-');
+        auto new_name = generate_buffer_name([&](int i) {
+            return format("{}{}*", prefix, i);
+        });
+        const bool ok = buffer->set_name(new_name);
+        kak_assert(ok);
     }
-    else
-        buffer = buffer_manager.create_buffer(
-            std::move(name), flags | Buffer::Flags::Fifo | Buffer::Flags::NoUndo,
-            {StringData::create("\n")}, ByteOrderMark::None, EolFormat::Lf, {InvalidTime, {}, {}});
+    buffer = buffer_manager.create_buffer(
+        std::move(name), flags | Buffer::Flags::Fifo | Buffer::Flags::NoUndo,
+        {StringData::create("\n")}, ByteOrderMark::None, EolFormat::Lf, {InvalidTime, {}, {}});
 
     struct FifoWatcher : FDWatcher
     {
@@ -340,15 +354,4 @@ Vector<String> undo_group_as_strings(const Buffer::UndoGroup& undo_group)
     return res;
 }
 
-String generate_buffer_name(StringView pattern)
-{
-    auto& buffer_manager = BufferManager::instance();
-    for (int i = 0; true; ++i)
-    {
-        String name = format(pattern, i);
-        if (buffer_manager.get_buffer_ifp(name) == nullptr)
-            return name;
-    }
-}
-
 }

src/buffer_utils.hh

@@ -2,6 +2,7 @@
 #define buffer_utils_hh_INCLUDED
 
 #include "buffer.hh"
+#include "buffer_manager.hh"
 #include "selection.hh"
 
 #include "utf8_iterator.hh"
@@ -85,7 +86,18 @@ void write_to_debug_buffer(StringView str);
 Vector<String> history_as_strings(const Vector<Buffer::HistoryNode>& history);
 Vector<String> undo_group_as_strings(const Buffer::UndoGroup& undo_group);
 
-String generate_buffer_name(StringView pattern);
+template<typename  Func>
+String generate_buffer_name(Func&& func)
+{
+    auto& buffer_manager = BufferManager::instance();
+    for (int i = 0; true; ++i)
+    {
+        String name = func(i);
+        if (buffer_manager.get_buffer_ifp(name) == nullptr)
+            return name;
+    }
+}
+
 
 }
 

src/commands.cc

@@ -453,7 +453,8 @@ void edit(const ParametersParser& parser, Context& context, const ShellContext&)
 
     auto& buffer_manager = BufferManager::instance();
     const auto& name = parser.positional_count() > 0 ?
-        parser[0] : (scratch ? generate_buffer_name("*scratch-{}*") : context.buffer().name());
+        parser[0] : (scratch ? generate_buffer_name([](int i) {  return format("*scratch-{}*", i); })
+                             : context.buffer().name());
 
     Buffer* buffer = buffer_manager.get_buffer_ifp(name);
     if (scratch)
@@ -965,7 +966,8 @@ const CommandDesc rename_buffer_cmd = {
     ParameterDesc{
         {
             { "scratch",  { {}, "convert a file buffer to a scratch buffer" } },
-            { "file",  { {}, "convert a scratch buffer to a file buffer" } }
+            { "file",  { {}, "convert a scratch buffer to a file buffer" } },
+            { "unique",  { {}, "substitute '|' in <name> to create a unique buffer name" } }
         },
         ParameterDesc::Flags::None, 1, 1
     },
@@ -985,8 +987,23 @@ const CommandDesc rename_buffer_cmd = {
 
         const bool is_file = (buffer.flags() & Buffer::Flags::File);
 
-        if (not buffer.set_name(is_file ? parse_filename(parser[0]) : parser[0]))
-            throw runtime_error(format("unable to change buffer name to '{}': a buffer with this name already exists", parser[0]));
+        String name;
+        if (parser.get_switch("unique"))
+        {
+            auto& pattern = parser[0];
+            auto options = option_from_string(
+                Meta::Type<std::tuple<String, String>>{}, pattern);
+            name = generate_buffer_name([&](int i) {
+                return format("{}{}{}", std::get<0>(options), i, std::get<1>(options));
+            });
+        }
+        else if (is_file)
+            name = parse_filename(parser[0]);
+        else
+            name = parser[0];
+
+        if (not buffer.set_name(name))
+            throw runtime_error(format("unable to change buffer name to '{}': a buffer with this name already exists", name));
     }
 };
 

src/remote.cc

@@ -806,7 +806,9 @@ class Server::Accepter
                 auto env_vars = m_reader.read<HashMap<String, String, MemoryDomain::EnvVars>>();
 
                 if (auto stdin_fd = m_reader.ancillary_fd())
-                    create_fifo_buffer(generate_buffer_name("*stdin-{}*"), *stdin_fd, Buffer::Flags::None);
+                    create_fifo_buffer(
+                        generate_buffer_name([](int i) {  return format("*stdin-{}*", i); }),
+                        *stdin_fd, Buffer::Flags::None);
 
                 auto* ui = new RemoteUI{sock, dimensions};
                 ClientManager::instance().create_client(