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

Merge branch 'master' into zig-0.14

Browse source
This commit is contained in:
CJ van den Berg 2025-03-05 21:59:16 +01:00
commit ce6df051fb
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/tui/editor.zig
View file

@ -4020,12 +4020,18 @@ pub const Editor = struct {
const b = try self.buf_for_update(); const b = try self.buf_for_update();
var root = b.root; var root = b.root;
for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| { for (self.cursels.items) |*cursel_| if (cursel_.*) |*cursel| {
var indent_extra = true;
const smart_brace_indent = blk: { const smart_brace_indent = blk: {
var sel = Selection.from_cursor(&cursel.cursor); var sel = Selection.from_cursor(&cursel.cursor);
move_cursor_left(root, &sel.begin, self.metrics) catch break :blk false; move_cursor_left(root, &sel.begin, self.metrics) catch break :blk false;
const egc_left, _, _ = sel.end.egc_at(root, self.metrics) catch break :blk false; const egc_left, _, _ = sel.end.egc_at(root, self.metrics) catch break :blk false;
const egc_right, _, _ = sel.begin.egc_at(root, self.metrics) catch break :blk false; const egc_right, _, _ = sel.begin.egc_at(root, self.metrics) catch break :blk false;
break :blk std.mem.eql(u8, egc_right, "{") and std.mem.eql(u8, egc_left, "}"); if (std.mem.eql(u8, egc_right, "[") and std.mem.eql(u8, egc_left, "]")) {
indent_extra = false;
break :blk true;
}
break :blk (std.mem.eql(u8, egc_right, "{") and std.mem.eql(u8, egc_left, "}")) or
(std.mem.eql(u8, egc_right, "(") and std.mem.eql(u8, egc_left, ")"));
}; };
root = try self.cursel_smart_insert_line(root, cursel, b.allocator); root = try self.cursel_smart_insert_line(root, cursel, b.allocator);
@ -4034,7 +4040,8 @@ pub const Editor = struct {
const cursor = cursel.cursor; const cursor = cursel.cursor;
root = try self.cursel_smart_insert_line(root, cursel, b.allocator); root = try self.cursel_smart_insert_line(root, cursel, b.allocator);
cursel.cursor = cursor; cursel.cursor = cursor;
root = try self.indent_cursel(root, cursel, b.allocator); if (indent_extra)
root = try self.indent_cursel(root, cursel, b.allocator);
} }
}; };
try self.update_buf(root); try self.update_buf(root);