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

refactor: merge select_line_around_cursor into select_line_at_cursor

Browse source
This commit is contained in:
CJ van den Berg 2025-10-30 12:45:17 +01:00
parent 4087e0a3f9
commit fc8642768d
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tui/editor.zig
View file

@ -3861,9 +3861,10 @@ pub const Editor = struct {
pub const enable_selection_meta: Meta = .{ .description = "Enable selection" }; pub const enable_selection_meta: Meta = .{ .description = "Enable selection" };
pub fn select_line_vim(self: *Self, _: Context) Result { pub fn select_line_vim(self: *Self, _: Context) Result {
const root = try self.buf_root();
self.selection_mode = .line; self.selection_mode = .line;
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_at_cursor(root, cursel, .hold_cursor);
self.collapse_cursors(); self.collapse_cursors();
self.clamp(); self.clamp();
@ -4103,7 +4104,7 @@ pub const Editor = struct {
return sel; return sel;
} }
fn select_line_at_cursor(self: *Self, root: Buffer.Root, cursel: *CurSel, mode: enum { include_eol, exclude_eol }) !void { fn select_line_at_cursor(self: *Self, root: Buffer.Root, cursel: *CurSel, mode: enum { include_eol, exclude_eol, hold_cursor }) !void {
const sel = try cursel.enable_selection(root, self.metrics); const sel = try cursel.enable_selection(root, self.metrics);
sel.normalize(); sel.normalize();
try move_cursor_begin(root, &sel.begin, self.metrics); try move_cursor_begin(root, &sel.begin, self.metrics);
@ -4112,15 +4113,10 @@ pub const Editor = struct {
.include_eol => move_cursor_right(root, &sel.end, self.metrics) catch {}, // catch{} because may be impossible to get eol (e.g., we're at eof) .include_eol => move_cursor_right(root, &sel.end, self.metrics) catch {}, // catch{} because may be impossible to get eol (e.g., we're at eof)
else => {}, else => {},
} }
cursel.cursor = sel.end; switch (mode) {
} .hold_cursor => {},
else => cursel.cursor = sel.end,
pub fn select_line_around_cursor(self: *Self, cursel: *CurSel) !void { }
const root = try self.buf_root();
const sel = try cursel.enable_selection(root, self.metrics);
sel.normalize();
try move_cursor_begin(root, &sel.begin, self.metrics);
try move_cursor_end(root, &sel.end, self.metrics);
} }
fn selection_reverse(_: Buffer.Root, cursel: *CurSel) !void { fn selection_reverse(_: Buffer.Root, cursel: *CurSel) !void {