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

Merge branch 'master' into zig-0.15

Browse source
This commit is contained in:
CJ van den Berg 2025-09-25 22:04:17 +02:00
commit 720bb9515f
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tui/editor.zig
View file

@ -4382,11 +4382,12 @@ pub const Editor = struct {
const root = try self.buf_root(); const root = try self.buf_root();
const cursel = self.get_primary(); const cursel = self.get_primary();
cursel.check_selection(root, self.metrics); cursel.check_selection(root, self.metrics);
if (cursel.selection) |_| if (cursel.selection) |_| {
try if (unnamed) try if (unnamed)
self.shrink_selection_to_child_node(root, cursel, self.metrics) self.shrink_selection_to_child_node(root, cursel, self.metrics)
else else
self.shrink_selection_to_named_child_node(root, cursel, self.metrics); self.shrink_selection_to_named_child_node(root, cursel, self.metrics);
} else try cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
self.clamp(); self.clamp();
try self.send_editor_jump_destination(); try self.send_editor_jump_destination();
} }
@ -4415,10 +4416,12 @@ pub const Editor = struct {
const root = try self.buf_root(); const root = try self.buf_root();
const cursel = self.get_primary(); const cursel = self.get_primary();
cursel.check_selection(root, self.metrics); cursel.check_selection(root, self.metrics);
try if (unnamed) if (cursel.selection) |_| {
self.select_next_sibling_node(root, cursel, self.metrics) try if (unnamed)
else self.select_next_sibling_node(root, cursel, self.metrics)
self.select_next_named_sibling_node(root, cursel, self.metrics); else
self.select_next_named_sibling_node(root, cursel, self.metrics);
} else try cursel.select_node(try self.top_node_at_cursel(cursel, root, self.metrics), root, self.metrics);
self.clamp(); self.clamp();
try self.send_editor_jump_destination(); try self.send_editor_jump_destination();
} }

2
src/tui/mode/overlay/buffer_palette.zig
View file

@ -34,7 +34,7 @@ pub fn load_entries(palette: *Type) !usize {
.indicator = indicator, .indicator = indicator,
}; };
} }
return if (palette.entries.items.len == 0) label.len else 4; return if (palette.entries.items.len == 0) label.len + 3 else 4;
} }
pub fn clear_entries(palette: *Type) void { pub fn clear_entries(palette: *Type) void {

5
src/tui/mode/vim.zig
View file

@ -35,6 +35,11 @@ const cmds_ = struct {
} }
pub const @"q!_meta": Meta = .{ .description = "q! (quit without saving)" }; pub const @"q!_meta": Meta = .{ .description = "q! (quit without saving)" };
pub fn @"qa!"(_: *void, _: Ctx) Result {
try cmd("quit_without_saving", .{});
}
pub const @"qa!_meta": Meta = .{ .description = "qa! (quit without saving anything)" };
pub fn wq(_: *void, _: Ctx) Result { pub fn wq(_: *void, _: Ctx) Result {
try cmd("save_file", command.fmt(.{ "then", .{ "quit", .{} } })); try cmd("save_file", command.fmt(.{ "then", .{ "quit", .{} } }));
} }