From a9e5c5b2622178e86f4e21390201aa8d3fccd3a5 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Fri, 22 Nov 2024 13:43:15 +0100
Subject: [PATCH] fix: editor paste

---
 src/tui/mode/mini/file_browser.zig   | 4 ++--
 src/tui/mode/mini/find.zig           | 4 ++--
 src/tui/mode/mini/find_in_files.zig  | 4 ++--
 src/tui/mode/overlay/open_recent.zig | 4 ++--
 src/tui/mode/overlay/palette.zig     | 4 ++--
 src/tui/tui.zig                      | 6 ++++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/tui/mode/mini/file_browser.zig b/src/tui/mode/mini/file_browser.zig
index fd2e51e..5fa94d7 100644
--- a/src/tui/mode/mini/file_browser.zig
+++ b/src/tui/mode/mini/file_browser.zig
@@ -333,10 +333,10 @@ pub fn Create(options: type) type {
             }
             pub const mini_mode_select_meta = .{ .description = "Select" };
 
-            pub fn paste(self: *Self, ctx: Ctx) Result {
+            pub fn mini_mode_paste(self: *Self, ctx: Ctx) Result {
                 return mini_mode_insert_bytes(self, ctx);
             }
-            pub const paste_meta = .{ .arguments = &.{.string} };
+            pub const mini_mode_paste_meta = .{ .arguments = &.{.string} };
         };
     };
 }
diff --git a/src/tui/mode/mini/find.zig b/src/tui/mode/mini/find.zig
index eee4666..1a67291 100644
--- a/src/tui/mode/mini/find.zig
+++ b/src/tui/mode/mini/find.zig
@@ -215,8 +215,8 @@ const cmds = struct {
     }
     pub const mini_mode_history_next_meta = .{ .description = "History next" };
 
-    pub fn paste(self: *Self, ctx: Ctx) Result {
+    pub fn mini_mode_paste(self: *Self, ctx: Ctx) Result {
         return mini_mode_insert_bytes(self, ctx);
     }
-    pub const paste_meta = .{ .arguments = &.{.string} };
+    pub const mini_mode_paste_meta = .{ .arguments = &.{.string} };
 };
diff --git a/src/tui/mode/mini/find_in_files.zig b/src/tui/mode/mini/find_in_files.zig
index 36d75f7..6f77426 100644
--- a/src/tui/mode/mini/find_in_files.zig
+++ b/src/tui/mode/mini/find_in_files.zig
@@ -153,8 +153,8 @@ const cmds = struct {
     }
     pub const mini_mode_delete_backwards_meta = .{ .description = "Delete backwards" };
 
-    pub fn paste(self: *Self, ctx: Ctx) Result {
+    pub fn mini_mode_paste(self: *Self, ctx: Ctx) Result {
         return mini_mode_insert_bytes(self, ctx);
     }
-    pub const paste_meta = .{ .arguments = &.{.string} };
+    pub const mini_mode_paste_meta = .{ .arguments = &.{.string} };
 };
diff --git a/src/tui/mode/overlay/open_recent.zig b/src/tui/mode/overlay/open_recent.zig
index 4526dff..f562acd 100644
--- a/src/tui/mode/overlay/open_recent.zig
+++ b/src/tui/mode/overlay/open_recent.zig
@@ -340,8 +340,8 @@ const cmds = struct {
     }
     pub const overlay_toggle_inputview_meta = .{};
 
-    pub fn paste(self: *Self, ctx: Ctx) Result {
+    pub fn mini_mode_paste(self: *Self, ctx: Ctx) Result {
         return overlay_insert_bytes(self, ctx);
     }
-    pub const paste_meta = .{ .arguments = &.{.string} };
+    pub const mini_mode_paste_meta = .{ .arguments = &.{.string} };
 };
diff --git a/src/tui/mode/overlay/palette.zig b/src/tui/mode/overlay/palette.zig
index b1c1122..47b4d42 100644
--- a/src/tui/mode/overlay/palette.zig
+++ b/src/tui/mode/overlay/palette.zig
@@ -465,10 +465,10 @@ pub fn Create(options: type) type {
             }
             pub const overlay_toggle_inputview_meta = .{};
 
-            pub fn paste(self: *Self, ctx: Ctx) Result {
+            pub fn mini_mode_paste(self: *Self, ctx: Ctx) Result {
                 return overlay_insert_bytes(self, ctx);
             }
-            pub const paste_meta = .{ .arguments = &.{.string} };
+            pub const mini_mode_paste_meta = .{ .arguments = &.{.string} };
         };
     };
 }
diff --git a/src/tui/tui.zig b/src/tui/tui.zig
index c7b53dc..be045e6 100644
--- a/src/tui/tui.zig
+++ b/src/tui/tui.zig
@@ -285,8 +285,10 @@ fn receive_safe(self: *Self, from: tp.pid_ref, m: tp.message) !void {
 
     if (try m.match(.{ "system_clipboard", tp.extract(&text) })) {
         try self.dispatch_flush_input_event();
-        try command.executeName("paste", command.fmt(.{text}));
-        return;
+        return if (command.get_id("mini_mode_paste")) |id|
+            command.execute(id, .{})
+        else
+            command.executeName("paste", command.fmt(.{text}));
     }
 
     if (try m.match(.{"render"})) {