src/keybind/builtin/flow.json

@@ -30,8 +30,8 @@
             ["ctrl+l", "scroll_view_center_cycle"],
             ["ctrl+n", "goto_next_match"],
             ["ctrl+p", "goto_prev_match"],
-            ["ctrl+b", "move_to_char", "left"],
+            ["ctrl+b", "move_to_char", false],
-            ["ctrl+t", "move_to_char", "right"],
+            ["ctrl+t", "move_to_char", true],
             ["ctrl+x", "cut"],
             ["ctrl+c", "copy"],
             ["ctrl+v", "system_paste"],

src/keybind/builtin/vim.json

@@ -85,9 +85,6 @@
 
             ["<C-k>", "TODO"],
 
-            ["F", "move_to_char", "left"],
-            ["f", "move_to_char", "right"],
-
             ["<C-CR>", ["move_down"], ["move_begin"]],
             ["<CR>", ["move_down"], ["move_begin"]]
         ]

src/tui/editor.zig

@@ -2084,9 +2084,7 @@ pub const Editor = struct {
     }
 
     fn move_cursor_up(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
-        cursor.move_up(root, metrics) catch |e| switch (e) {
+        try cursor.move_up(root, metrics);
-            error.Stop => cursor.move_begin(),
-        };
     }
 
     fn move_cursor_up_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
@@ -2095,9 +2093,7 @@ pub const Editor = struct {
     }
 
     fn move_cursor_down(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
-        cursor.move_down(root, metrics) catch |e| switch (e) {
+        try cursor.move_down(root, metrics);
-            error.Stop => cursor.move_end(root, metrics),
-        };
     }
 
     fn move_cursor_down_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {

src/tui/mode/mini/move_to_char.zig

@@ -30,13 +30,13 @@ const Operation = enum {
 };
 
 pub fn create(allocator: Allocator, ctx: command.Context) !struct { tui.Mode, tui.MiniMode } {
-    var direction: Direction = undefined;
+    var right: bool = true;
     const select = if (tui.get_active_editor()) |editor| if (editor.get_primary().selection) |_| true else false else false;
-    _ = ctx.args.match(.{tp.extract(&direction)}) catch return error.InvalidMoveToCharArgument;
+    _ = ctx.args.match(.{tp.extract(&right)}) catch return error.InvalidMoveToCharArgument;
     const self: *Self = try allocator.create(Self);
     self.* = .{
         .allocator = allocator,
-        .direction = direction,
+        .direction = if (right) .right else .left,
         .operation = if (select) .select else .move,
     };
     try self.commands.init(self);