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

refactor: simplify Editor.select_word_at_cursor

Browse source
This commit is contained in:
CJ van den Berg 2025-12-28 21:17:30 +01:00
parent 38948cf492
commit e23d35b8c7
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tui/editor.zig
View file

@ -2840,8 +2840,8 @@ pub const Editor = struct {
fn copy_word_at_cursor(self: *Self, text_allocator: Allocator) ![]const u8 { fn copy_word_at_cursor(self: *Self, text_allocator: Allocator) ![]const u8 {
const root = try self.buf_root(); const root = try self.buf_root();
const primary = self.get_primary(); const primary = self.get_primary();
const sel = if (primary.selection) |*sel| sel else try self.select_word_at_cursor(primary); const sel = if (primary.selection) |sel| sel else try self.select_word_at_cursor(primary);
return try copy_selection(root, sel.*, text_allocator, self.metrics); return try copy_selection(root, sel, text_allocator, self.metrics);
} }
pub fn cut_selection(self: *Self, root: Buffer.Root, cursel: *CurSel, text_allocator: Allocator) !struct { []const u8, Buffer.Root } { pub fn cut_selection(self: *Self, root: Buffer.Root, cursel: *CurSel, text_allocator: Allocator) !struct { []const u8, Buffer.Root } {
@ -4531,7 +4531,7 @@ pub const Editor = struct {
} }
pub const select_all_meta: Meta = .{ .description = "Select all" }; pub const select_all_meta: Meta = .{ .description = "Select all" };
fn select_word_at_cursor(self: *Self, cursel: *CurSel) !*Selection { fn select_word_at_cursor(self: *Self, cursel: *CurSel) error{Stop}!Selection {
const root = try self.buf_root(); const root = try self.buf_root();
const sel = cursel.enable_selection(root, self.metrics); const sel = cursel.enable_selection(root, self.metrics);
defer cursel.check_selection(root, self.metrics); defer cursel.check_selection(root, self.metrics);
@ -4539,7 +4539,7 @@ pub const Editor = struct {
try move_cursor_word_begin(root, &sel.begin, self.metrics); try move_cursor_word_begin(root, &sel.begin, self.metrics);
move_cursor_word_end(root, &sel.end, self.metrics) catch {}; move_cursor_word_end(root, &sel.end, self.metrics) catch {};
cursel.cursor = sel.end; cursel.cursor = sel.end;
return sel; return sel.*;
} }
pub fn select_line_at_cursor(self: *Self, root: Buffer.Root, cursel: *CurSel, mode: enum { include_eol, exclude_eol, hold_cursor }) !void { pub fn select_line_at_cursor(self: *Self, root: Buffer.Root, cursel: *CurSel, mode: enum { include_eol, exclude_eol, hold_cursor }) !void {