Registers hold a value per range, and "<reg> names one

Registers.zig replaces the one yank buffer: every register keeps a value per
range, y fills them in document order, and p, P, R and insert Ctrl-r put
value i at range i, repeating the last (helix paste_impl). "<reg> names the
register for the next command; _ swallows, # numbers the ranges, . is each
range's text, % the file's name, / the last s/S pattern, and + and * are the
system clipboard through the ClipYank and ClipPaste paths. SPC y now writes
+ alone, as helix's does. The acme chords and a paste into a terminal take
the default register joined by newlines. The msel-yank-paste waiver is gone.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

1 files changed, 10 insertions, 10 deletions

diff --git a/test/panes.zig b/test/panes.zig
index d0551cfc..cbf9d097 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -325,7 +325,7 @@ const TagNavigationTests = struct {
         try std.testing.expectEqual(@as(i32, 0), pane.tag.cur_col);
         key(p, 'E');
         key(p, 'y');
-        try std.testing.expectEqualStrings("/test.txt", p.yank.?);
+        try std.testing.expectEqualStrings("/test.txt", p.registers.text(p.gpa, '"').?);
         // an edit that reaches into it is refused, the cursor with it
         const before = try std.testing.allocator.dupe(u8, try pardes.edit.flatSurface(p, &pane.tag));
         defer std.testing.allocator.free(before);
@@ -848,12 +848,12 @@ const TtySelectionTests = struct {
         const x = rect.x + config.GUTTER;
         const y = p.bodyTop(pane, rect);
         JumpSelectionTests.drag(p, x + 1, y, x + 3, y);
-        try std.testing.expectEqualStrings("lph", p.yank orelse return error.MissingAutomaticTtyYank);
+        try std.testing.expectEqualStrings("lph", p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
         p.update(.{ .key = .{ .cp = p.opts.tty_toggle, .ctrl = true } });
         p.update(.{ .key = .{ .cp = 'l' } });
         try std.testing.expectEqual(@as(i32, 4), pane.body.cur_col);
         p.update(.{ .key = .{ .cp = 'y' } });
-        try std.testing.expectEqualStrings("a", p.yank.?);
+        try std.testing.expectEqualStrings("a", p.registers.text(p.gpa, '"').?);
         try noChildInput(p);
     }
 
@@ -881,7 +881,7 @@ const TtySelectionTests = struct {
             const expected = if (prompt) "$ ab" else "lph\nrav";
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
-            try std.testing.expectEqualStrings(expected, p.yank orelse return error.MissingAutomaticTtyYank);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
             try noChildInput(p);
 
             try std.testing.expect(p.executeBuiltinLine(0, "ClipYank"));
@@ -897,7 +897,7 @@ const TtySelectionTests = struct {
             }
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
             p.update(.{ .key = .{ .cp = 'y' } });
-            try std.testing.expectEqualStrings(expected, p.yank.?);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"').?);
             try noChildInput(p);
             p.update(.{ .key = .{ .cp = p.opts.tty_toggle, .ctrl = true } });
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
@@ -908,7 +908,7 @@ const TtySelectionTests = struct {
             _ = try p.render(frame.allocator());
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
-            try std.testing.expectEqualStrings(expected, p.yank.?);
+            try std.testing.expectEqualStrings(expected, p.registers.text(p.gpa, '"').?);
             try noChildInput(p);
         }
     }
@@ -940,7 +940,7 @@ const TtySelectionTests = struct {
                 const sx = source.x + config.GUTTER;
                 const sy = if (p.settings.tag_bottom) source.y else source.y + pardes.BOX_H;
                 JumpSelectionTests.drag(p, sx + 1, sy, sx + 3, sy + 1);
-                try std.testing.expectEqualStrings("lph\nrav", p.yank orelse return error.MissingAutomaticTtyYank);
+                try std.testing.expectEqualStrings("lph\nrav", p.registers.text(p.gpa, '"') orelse return error.MissingAutomaticTtyYank);
                 try noChildInput(p);
 
                 const target = p.rects[1];
@@ -1001,7 +1001,7 @@ const TtySelectionTests = struct {
             try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
             if (bracketed) p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?2004h" } });
             try std.testing.expectEqual(bracketed, panes.Terminal.bracketedPaste(pane));
-            p.yank = try p.gpa.dupe(u8, "one\ntwo"); // what a `y` anywhere left behind
+            p.registers.put(p.gpa, '"', "one\ntwo", 0, 1, true); // what a `y` anywhere left behind
             var buf: [256]u8 = undefined;
             _ = childInput(p, &buf);
 
@@ -1033,7 +1033,7 @@ const TtySelectionTests = struct {
                 );
             }
             // ...and neither chord put the clipboard in the register on its way.
-            try std.testing.expectEqualStrings("one\ntwo", p.yank orelse "");
+            try std.testing.expectEqualStrings("one\ntwo", p.registers.text(p.gpa, '"') orelse "");
         }
     }
 };
@@ -4242,7 +4242,7 @@ test "an empty counted paste leaves no count for the next motion" {
         const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 60, .rows = 12 });
         defer p.deinit();
         const pane = try p.setTestFile("abcdefgh\n");
-        if (empty_register) p.yank = try p.gpa.dupe(u8, "");
+        if (empty_register) p.registers.put(p.gpa, '"', "", 0, 1, true);
         for ("3p") |cp| p.update(.{ .key = .{ .cp = cp } });
         try std.testing.expectEqual(modal.Normal.State{}, pane.body.normal);
         p.update(.{ .key = .{ .cp = 'l' } });