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

Compare commits

base: neurocyte:1eb6a773e5a0369bcdd38cdc4cf94077156d9753
Branches Tags
neurocyte:master
neurocyte:zig-0.15.0
neurocyte:zig-0.13
neurocyte:v0.3.3
neurocyte:v0.3.2
neurocyte:v0.3.1
neurocyte:v0.3.0
neurocyte:v0.2.1
neurocyte:v0.2.0
neurocyte:v0.1.0
neurocyte:v0.0.1
..
compare: neurocyte:c7cca545b9ceaf0a66885544caf020ecb63e66c5
Branches Tags
neurocyte:zig-0.15.0
neurocyte:master
neurocyte:zig-0.13
neurocyte:v0.3.3
neurocyte:v0.3.2
neurocyte:v0.3.1
neurocyte:v0.3.0
neurocyte:v0.2.1
neurocyte:v0.2.0
neurocyte:v0.1.0
neurocyte:v0.0.1

2 commits
1eb6a773e5 ... c7cca545b9

Author SHA1 Message Date
CJ van den Berg
c7cca545b9
fix: make move_cursor_up/_down fallback to move_begin/_end 
closes #185
 2025-02-19 18:42:14 +01:00
CJ van den Berg
fdabe03e91
refactor: run zig fmt 2025-02-19 18:41:46 +01:00
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tui/editor.zig
View file

@ -2083,21 +2083,25 @@ pub const Editor = struct {
} }
fn move_cursor_up(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void { fn move_cursor_up(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
try cursor.move_up(root, metrics); cursor.move_up(root, metrics) catch |e| switch (e) {
error.Stop => cursor.move_begin(),
};
} }
fn move_cursor_up_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void { fn move_cursor_up_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
try cursor.move_up(root, metrics); try cursor.move_up(root, metrics);
if(is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics); if (is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics);
} }
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 {
try cursor.move_down(root, metrics); cursor.move_down(root, metrics) catch |e| switch (e) {
error.Stop => cursor.move_end(root, metrics),
};
} }
fn move_cursor_down_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void { fn move_cursor_down_vim(root: Buffer.Root, cursor: *Cursor, metrics: Buffer.Metrics) !void {
try cursor.move_down(root, metrics); try cursor.move_down(root, metrics);
if(is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics); if (is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics);
} }
fn move_cursor_buffer_begin(_: Buffer.Root, cursor: *Cursor, _: Buffer.Metrics) !void { fn move_cursor_buffer_begin(_: Buffer.Root, cursor: *Cursor, _: Buffer.Metrics) !void {
@ -2122,7 +2126,7 @@ pub const Editor = struct {
fn move_cursor_half_page_up_vim(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void { fn move_cursor_half_page_up_vim(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void {
cursor.move_half_page_up(root, view, metrics); cursor.move_half_page_up(root, view, metrics);
if(is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics); if (is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics);
} }
fn move_cursor_half_page_down(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void { fn move_cursor_half_page_down(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void {
@ -2131,7 +2135,7 @@ pub const Editor = struct {
fn move_cursor_half_page_down_vim(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void { fn move_cursor_half_page_down_vim(root: Buffer.Root, cursor: *Cursor, view: *const View, metrics: Buffer.Metrics) !void {
cursor.move_half_page_down(root, view, metrics); cursor.move_half_page_down(root, view, metrics);
if(is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics); if (is_eol_vim(root, cursor, metrics)) try move_cursor_left_vim(root, cursor, metrics);
} }
pub fn primary_click(self: *Self, y: c_int, x: c_int) !void { pub fn primary_click(self: *Self, y: c_int, x: c_int) !void {
@ -3480,7 +3484,7 @@ pub const Editor = struct {
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel|
try self.select_line_around_cursor(cursel); try self.select_line_around_cursor(cursel);
self.collapse_cursors(); 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)" };