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

feat: make expand_selection and shrink_selection multicursor aware

Browse source
This commit is contained in:
CJ van den Berg 2026-01-16 11:22:42 +01:00
parent 548410f769
commit 6ac7cc5b5c
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/tui/editor.zig
View file

@ -4663,15 +4663,22 @@ pub const Editor = struct {
node = try cursel.select_parent_node(node, root, metrics);
}
pub fn expand_selection(self: *Self, _: Context) Result {
try self.send_editor_jump_source();
const root = try self.buf_root();
const cursel = self.get_primary();
fn expand_selection_cursel(self: *Self, root: Buffer.Root, cursel: *CurSel, _: Allocator) error{Stop}!Buffer.Root {
cursel.check_selection(root, self.metrics);
try if (cursel.selection) |_|
self.expand_selection_to_parent_node(root, cursel, self.metrics)
self.expand_selection_to_parent_node(root, cursel, self.metrics) catch |e| switch (e) {
error.NotFound => error.Stop,
else => |e_| e_,
}
else
cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
return root;
}
pub fn expand_selection(self: *Self, ctx: Context) Result {
try self.send_editor_jump_source();
const root = try self.buf_root();
_ = try self.with_cursels_mut_repeat(root, &expand_selection_cursel, try self.buf_a(), ctx);
self.clamp();
try self.send_editor_jump_destination();
}
@ -4695,19 +4702,32 @@ pub const Editor = struct {
return cursel.select_node(child, root, metrics);
}
fn shrink_selection_cursel_unnamed(self: *Self, root: Buffer.Root, cursel: *CurSel, _: Allocator) error{Stop}!Buffer.Root {
if (cursel.selection) |_|
try self.shrink_selection_to_child_node(root, cursel, self.metrics)
else
cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
return root;
}
fn shrink_selection_cursel(self: *Self, root: Buffer.Root, cursel: *CurSel, _: Allocator) error{Stop}!Buffer.Root {
if (cursel.selection) |_|
try self.shrink_selection_to_named_child_node(root, cursel, self.metrics)
else
cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
return root;
}
pub fn shrink_selection(self: *Self, ctx: Context) Result {
var unnamed: bool = false;
_ = ctx.args.match(.{tp.extract(&unnamed)}) catch false;
try self.send_editor_jump_source();
const root = try self.buf_root();
const cursel = self.get_primary();
cursel.check_selection(root, self.metrics);
if (cursel.selection) |_| {
try if (unnamed)
self.shrink_selection_to_child_node(root, cursel, self.metrics)
_ = if (unnamed)
try self.with_cursels_mut_repeat(root, &shrink_selection_cursel_unnamed, try self.buf_a(), .{})
else
self.shrink_selection_to_named_child_node(root, cursel, self.metrics);
} else cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
try self.with_cursels_mut_repeat(root, &shrink_selection_cursel, try self.buf_a(), ctx);
self.clamp();
try self.send_editor_jump_destination();
}