neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(vim): Remove 'jk' keybinding again and make select_line_vim work on multiple cursors

Browse source
This commit is contained in:
lulvz 2025-02-13 13:38:04 +00:00
parent 69e1513441
commit 1b016774c7
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/keybind/builtin/vim.json
View file

@ -176,7 +176,6 @@
"line_numbers": "absolute", "line_numbers": "absolute",
"cursor": "beam", "cursor": "beam",
"press": [ "press": [
["jk", "enter_mode", "normal"],
["<Esc>", ["move_left_vim"], ["enter_mode", "normal"]], ["<Esc>", ["move_left_vim"], ["enter_mode", "normal"]],
["<Del>", "delete_forward"], ["<Del>", "delete_forward"],
["<BS>", "delete_backward"], ["<BS>", "delete_backward"],

10
src/tui/editor.zig
View file

@ -2032,7 +2032,7 @@ pub const Editor = struct {
fn is_eol_vim(root: Buffer.Root, cursor: *const Cursor, metrics: Buffer.Metrics) bool { fn is_eol_vim(root: Buffer.Root, cursor: *const Cursor, metrics: Buffer.Metrics) bool {
const line_width = root.line_width(cursor.row, metrics) catch return true; const line_width = root.line_width(cursor.row, metrics) catch return true;
if (line_width == 0) return true; if (line_width == 0) return true;
if (cursor.col == line_width) if (cursor.col >= line_width)
return true; return true;
return false; return false;
} }
@ -3476,11 +3476,11 @@ pub const Editor = struct {
pub const cancel_meta = .{ .description = "Cancel current action" }; pub const cancel_meta = .{ .description = "Cancel current action" };
pub fn select_line_vim(self: *Self, _: Context) Result { pub fn select_line_vim(self: *Self, _: Context) Result {
const primary = self.get_primary();
const root = self.buf_root() catch return;
primary.disable_selection(root, self.metrics);
self.selection_mode = .line; self.selection_mode = .line;
try self.select_line_around_cursor(primary); for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel|
try self.select_line_around_cursor(cursel);
self.collapse_cursors();
self.clamp(); self.clamp();
} }
pub const select_line_vim_meta = .{ .description = "Select the line around the cursor (vim)" }; pub const select_line_vim_meta = .{ .description = "Select the line around the cursor (vim)" };