.gitignore

@@ -1,4 +1,3 @@
 /.cache/
-src/.cache
 /zig-out/
 /.zig-cache/

src/keybind/builtin/helix.json

@@ -25,6 +25,7 @@
             ["ctrl+^", "open_previous_file"],
 
             ["alt+.", "repeat_last_motion"],
+            ["alt+`", "to_upper"],
             ["alt+d", "delete_backward"],
             ["alt+c", "change_backward_helix"],
 
@@ -59,6 +60,7 @@
             ["alt+|", "shell_pipe_to"],
             ["alt+!", "shell_append_output"],
 
+            ["~", "switch_case"],
             ["T", "till_prev_char"],
             ["F", "move_to_char", "move_to_char_left"],
             ["W", "move_next_long_word_start"],
@@ -70,21 +72,15 @@
             ["O", ["enter_mode", "insert"], ["smart_insert_line_before"]],
 
             ["C", "add_cursor_down"],
-
             ["S", "split_selection"],
             ["X", "extend_to_line_bounds"],
             ["?", "rfind"],
             ["N", "goto_prev_match"],
             ["*", "search_selection"],
 
-            ["~", "switch_case"],
+            ["U", "redo"],
-            ["`", "to_lower"],
+            ["P", "paste"],
-            ["alt+`", "to_upper"],
+            ["Q", "replay_macro"],
-
-            ["r", "replace"],
-            ["P", "paste_clipboard_before"],
-            ["R", "replace_selections_with_clipboard"],
-            ["p", "paste_after"],
 
             [">", "indent"],
             ["<", "unindent"],
@@ -112,6 +108,8 @@
             ["t", "find_till_char"],
             ["f", "move_to_char", "move_to_char_right"],
 
+            ["`", "to_lower"],
+
             ["home", "move_begin"],
             ["end", "move_end"],
             ["kp_home", "move_begin"],
@@ -123,7 +121,7 @@
 
             ["v", "enter_mode", "select"],
 
-            ["g g", "move_buffer_begin"],
+            ["g g", "goto_line_vim"],
             ["g e", "move_buffer_end"],
             ["g f", "goto_file"],
             ["g h", "move_begin"],
@@ -191,15 +189,13 @@
 
             ["/", "find"],
             ["n", "goto_next_match"],
-
             ["u", "undo"],
-            ["U", "redo"],
 
             ["y", ["enable_selection"], ["copy_helix"], ["enter_mode", "normal"]],
             ["%", "select_all"],
+            ["p", "paste_after"],
 
             ["q", "record_macro"],
-            ["Q", "replay_macro"],
 
             ["=", "format_selections"],
 
@@ -271,6 +267,8 @@
 
             ["b", "select_word_left"],
             ["w", "select_word_right"],
+            ["g g", "select_buffer_begin"],
+            ["g e", "select_buffer_end"],
 
             ["ctrl+b", "select_page_up"],
             ["ctrl+f", "select_page_down"],
@@ -366,9 +364,11 @@
             ["N", "extend_search_next"],
             ["*", "extend_search_prev"],
 
-            ["P", "paste_clipboard_before"],
+            ["U", "redo"],
-            ["R", ["replace_selections_with_clipboard"], ["enter_mode", "normal"]],
+
-            ["p", "paste_after"],
+            ["P", "paste"],
+
+            ["Q", "replay_macro"],
 
             [">", "indent"],
             ["<", "unindent"],
@@ -426,7 +426,7 @@
             ["g s", "smart_move_begin"],
             ["g d", "goto_definition"],
             ["g y", "goto_type_definition"],
-            ["g r", "references"],
+            ["g r", "goto_reference"],
             ["g i", "goto_implementation"],
             ["g t", "goto_window_top"],
             ["g c", "goto_window_center"],
@@ -488,14 +488,12 @@
 
             ["/", "find"],
             ["n", "goto_next_match"],
-
             ["u", "undo"],
-            ["U", "redo"],
 
             ["y", ["copy_helix"], ["enter_mode", "normal"]],
+            ["p", "paste_after"],
 
             ["q", "record_macro"],
-            ["Q", "replay_macro"],
 
             ["=", "format_selections"],
 

src/tui/editor.zig

@@ -150,7 +150,7 @@ pub const CurSel = struct {
         }
     }
 
-    pub fn disable_selection_normal(self: *Self) void {
+    fn disable_selection_normal(self: *Self) void {
         self.selection = null;
     }
 
@@ -1917,7 +1917,7 @@ pub const Editor = struct {
         return try move(root, &cursel.cursor, allocator);
     }
 
-    pub fn with_selection_const(root: Buffer.Root, move: cursor_operator_const, cursel: *CurSel, metrics: Buffer.Metrics) error{Stop}!void {
+    fn with_selection_const(root: Buffer.Root, move: cursor_operator_const, cursel: *CurSel, metrics: Buffer.Metrics) error{Stop}!void {
         const sel = try cursel.enable_selection(root, metrics);
         try move(root, &sel.end, metrics);
         cursel.cursor = sel.end;
@@ -2229,7 +2229,7 @@ pub const Editor = struct {
         return false;
     }
 
-    pub fn is_eol_right(root: Buffer.Root, cursor: *const Cursor, metrics: Buffer.Metrics) bool {
+    fn is_eol_right(root: Buffer.Root, cursor: *const Cursor, metrics: Buffer.Metrics) bool {
         const line_width = root.line_width(cursor.row, metrics) catch return true;
         if (cursor.col >= line_width)
             return true;
@@ -2308,7 +2308,7 @@ pub const Editor = struct {
         if (is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics);
     }
 
-    pub fn move_cursor_down(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
+    fn move_cursor_down(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
         cursor.move_down(root, metrics) catch |e| switch (e) {
             error.Stop => cursor.move_end(root, metrics),
         };

src/tui/mode/helix.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const Allocator = std.mem.Allocator;
 const log = @import("log");
 const tp = @import("thespian");
 const location_history = @import("location_history");
@@ -393,29 +392,45 @@ const cmds_ = struct {
         const ed = mv.get_active_editor() orelse return;
         const root = ed.buf_root() catch return;
 
-        tui.clipboard_clear_all();
-
         for (ed.cursels.items) |*cursel_| if (cursel_.*) |*cursel| if (cursel.selection) |sel|
             tui.clipboard_add_chunk(try Editor.copy_selection(root, sel, tui.clipboard_allocator(), ed.metrics));
-
-        ed.logger.print("copy: {d} selections", .{ed.cursels.items.len});
     }
     pub const copy_helix_meta: Meta = .{ .description = "Copy selection to clipboard (helix)" };
 
     pub fn paste_after(_: *void, ctx: Ctx) Result {
-        try paste_helix(ctx, insert_after);
+        const mv = tui.mainview() orelse return;
+        const ed = mv.get_active_editor() orelse return;
+
+        var text_: []const u8 = undefined;
+        const clipboard: []const []const u8 = if (ctx.args.buf.len > 0 and try ctx.args.match(.{tp.extract(&text_)}))
+            &[_][]const u8{text_}
+        else
+            tui.clipboard_get_history() orelse return;
+
+        const b = try ed.buf_for_update();
+        var root = b.root;
+
+        var bytes: usize = 0;
+        var cursel_idx = ed.cursels.items.len - 1;
+        var idx = clipboard.len - 1;
+        while (true) {
+            const cursel_ = &ed.cursels.items[cursel_idx];
+            if (cursel_.*) |*cursel| {
+                const text = clipboard[idx];
+                root = try insert(ed, root, cursel, text, b.allocator);
+                idx = if (idx == 0) clipboard.len - 1 else idx - 1;
+                bytes += text.len;
+            }
+            if (cursel_idx == 0) break;
+            cursel_idx -= 1;
+        }
+        ed.logger.print("paste: {d} bytes", .{bytes});
+
+        try ed.update_buf(root);
+        ed.clamp();
+        ed.need_render();
     }
     pub const paste_after_meta: Meta = .{ .description = "Paste from clipboard after selection" };
-
-    pub fn replace_selections_with_clipboard(_: *void, ctx: Ctx) Result {
-        try paste_helix(ctx, insert_replace_selection);
-    }
-    pub const replace_selections_with_clipboard_meta: Meta = .{ .description = "Replace selection from clipboard" };
-
-    pub fn paste_clipboard_before(_: *void, ctx: Ctx) Result {
-        try paste_helix(ctx, insert_before);
-    }
-    pub const paste_clipboard_before_meta: Meta = .{ .description = "Paste from clipboard before selection" };
 };
 
 fn move_cursor_word_left_helix(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) error{Stop}!void {
@@ -449,75 +464,15 @@ fn move_cursor_word_right_end_helix(root: Buffer.Root, cursor: *Cursor, metrics:
     try cursor.move_right(root, metrics);
 }
 
-fn insert_before(editor: *Editor, root: Buffer.Root, cursel: *CurSel, text: []const u8, allocator: Allocator) !Buffer.Root {
+fn insert(ed: *Editor, root: Buffer.Root, cursel: *CurSel, s: []const u8, allocator: std.mem.Allocator) !Buffer.Root {
-    var root_: Buffer.Root = root;
+    var root_ = root;
-    const cursor: *Cursor = &cursel.cursor;
-
-    cursel.check_selection(root, editor.metrics);
-    if (cursel.selection) |sel_| {
-        var sel = sel_;
-        sel.normalize();
-        cursor.move_to(root, sel.begin.row, sel.begin.col, editor.metrics) catch {};
-
-        if (text[text.len - 1] == '\n') {
-            cursor.move_begin();
-        }
-    } else if (text[text.len - 1] == '\n') {
-        cursor.move_begin();
-    }
-
-    cursel.disable_selection_normal();
-    const begin = cursel.cursor;
-    cursor.row, cursor.col, root_ = try root_.insert_chars(cursor.row, cursor.col, text, allocator, editor.metrics);
-    cursor.target = cursor.col;
-    cursel.selection = Selection{ .begin = begin, .end = cursor.* };
-    editor.nudge_insert(.{ .begin = begin, .end = cursor.* }, cursel, text.len);
-    return root_;
-}
-
-fn insert_replace_selection(editor: *Editor, root: Buffer.Root, cursel: *CurSel, text: []const u8, allocator: Allocator) !Buffer.Root {
-    // replaces the selection, if no selection, replaces the current
-    // character and sets the selection to the replacement text
-    var root_: Buffer.Root = root;
-    cursel.check_selection(root, editor.metrics);
-
-    if (cursel.selection == null) {
-        // Select current character to replace it
-        Editor.with_selection_const(root, move_noop, cursel, editor.metrics) catch {};
-    }
-    root_ = editor.delete_selection(root, cursel, allocator) catch root;
-
     const cursor = &cursel.cursor;
+    if (cursel.selection == null) cursor.move_right(root_, ed.metrics) catch {};
     const begin = cursel.cursor;
-    cursor.row, cursor.col, root_ = try root_.insert_chars(cursor.row, cursor.col, text, allocator, editor.metrics);
+    cursor.row, cursor.col, root_ = try root_.insert_chars(cursor.row, cursor.col, s, allocator, ed.metrics);
     cursor.target = cursor.col;
+    ed.nudge_insert(.{ .begin = begin, .end = cursor.* }, cursel, s.len);
     cursel.selection = Selection{ .begin = begin, .end = cursor.* };
-    editor.nudge_insert(.{ .begin = begin, .end = cursor.* }, cursel, text.len);
-    return root_;
-}
-
-fn insert_after(editor: *Editor, root: Buffer.Root, cursel: *CurSel, text: []const u8, allocator: Allocator) !Buffer.Root {
-    var root_: Buffer.Root = root;
-    const cursor = &cursel.cursor;
-    cursel.check_selection(root, editor.metrics);
-    if (text[text.len - 1] == '\n') {
-        move_cursor_carriage_return(root, cursel.*, cursor, editor.metrics) catch {};
-    } else {
-        if (cursel.selection) |sel_| {
-            var sel = sel_;
-            sel.normalize();
-            cursor.move_to(root, sel.end.row, sel.end.col, editor.metrics) catch {};
-        } else {
-            cursor.move_right(root_, editor.metrics) catch {};
-        }
-    }
-
-    cursel.disable_selection_normal();
-    const begin = cursel.cursor;
-    cursor.row, cursor.col, root_ = try root_.insert_chars(cursor.row, cursor.col, text, allocator, editor.metrics);
-    cursor.target = cursor.col;
-    cursel.selection = Selection{ .begin = begin, .end = cursor.* };
-    editor.nudge_insert(.{ .begin = begin, .end = cursor.* }, cursel, text.len);
     return root_;
 }
 
@@ -606,62 +561,6 @@ fn move_cursor_long_word_right_end(root: Buffer.Root, cursor: *Cursor, metrics:
     try cursor.move_right(root, metrics);
 }
 
-const pasting_function = @TypeOf(insert_before);
-
-fn paste_helix(ctx: command.Context, do_paste: pasting_function) command.Result {
-    const mv = tui.mainview() orelse return;
-    const ed = mv.get_active_editor() orelse return;
-    var text_: []const u8 = undefined;
-
-    const clipboard: []const []const u8 = if (ctx.args.buf.len > 0 and try ctx.args.match(.{tp.extract(&text_)}))
-        &[_][]const u8{text_}
-    else
-        tui.clipboard_get_history() orelse return;
-
-    const b = try ed.buf_for_update();
-    var root = b.root;
-
-    // Chunks from clipboard are paired to selections
-    // If more selections than chunks in the clipboard, the exceding selections
-    // use the last chunk in the clipboard
-
-    var bytes: usize = 0;
-    for (ed.cursels.items, 0..) |*cursel_, idx| if (cursel_.*) |*cursel| {
-        if (idx < clipboard.len) {
-            root = try do_paste(ed, root, cursel, clipboard[idx], b.allocator);
-            bytes += clipboard[idx].len;
-        } else {
-            bytes += clipboard[clipboard.len - 1].len;
-            root = try do_paste(ed, root, cursel, clipboard[clipboard.len - 1], b.allocator);
-        }
-    };
-    ed.logger.print("paste: {d} bytes", .{bytes});
-
-    try ed.update_buf(root);
-    ed.clamp();
-    ed.need_render();
-}
-
-fn move_cursor_carriage_return(root: Buffer.Root, cursel: CurSel, cursor: *Cursor, metrics: Buffer.Metrics) error{Stop}!void {
-    if (is_cursel_from_extend_line_below(cursel)) {
-        //The cursor is already beginning next line
-        return;
-    }
-    if (!Editor.is_eol_right(root, cursor, metrics)) {
-        try Editor.move_cursor_end(root, cursor, metrics);
-    }
-    try Editor.move_cursor_right(root, cursor, metrics);
-}
-
-fn is_cursel_from_extend_line_below(cursel: CurSel) bool {
-    if (cursel.selection) |sel_| {
-        var sel = sel_;
-        sel.normalize();
-        return sel.end.row != sel.begin.row and sel.end.col == 0;
-    }
-    return false;
-}
-
 const private = @This();
 // exports for unittests
 pub const test_internal = struct {
@@ -670,7 +569,4 @@ pub const test_internal = struct {
     pub const move_cursor_long_word_right_end = private.move_cursor_long_word_right_end;
     pub const move_cursor_word_left_helix = private.move_cursor_word_left_helix;
     pub const move_cursor_word_right_end_helix = private.move_cursor_word_right_end_helix;
-    pub const insert_before = private.insert_before;
-    pub const insert_replace_selection = private.insert_replace_selection;
-    pub const insert_after = private.insert_after;
 };