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

fix: over eager whitespace collapsing in smart_insert_line

Browse source
This commit is contained in:
CJ van den Berg 2025-08-18 21:07:49 +02:00
parent 9d127e4cc3
commit 9bc25620cb
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tui/editor.zig
View file

@ -4480,7 +4480,9 @@ pub const Editor = struct {
}; };
} }
fn cursel_smart_insert_line(self: *Self, root: Buffer.Root, cursel: *CurSel, b_allocator: std.mem.Allocator) !Buffer.Root { const WSCollapseMode = enum { leave_ws, collapse_ws };
fn cursel_smart_insert_line(self: *Self, root: Buffer.Root, cursel: *CurSel, b_allocator: std.mem.Allocator, mode: WSCollapseMode) !Buffer.Root {
const row = cursel.cursor.row; const row = cursel.cursor.row;
const leading_ws = @min(find_first_non_ws(root, row, self.metrics), cursel.cursor.col); const leading_ws = @min(find_first_non_ws(root, row, self.metrics), cursel.cursor.col);
var sfa = std.heap.stackFallback(512, self.allocator); var sfa = std.heap.stackFallback(512, self.allocator);
@ -4491,7 +4493,8 @@ pub const Editor = struct {
_ = try writer.write("\n"); _ = try writer.write("\n");
try self.generate_leading_ws(&writer, leading_ws); try self.generate_leading_ws(&writer, leading_ws);
var root_ = try self.insert(root, cursel, stream.items, b_allocator); var root_ = try self.insert(root, cursel, stream.items, b_allocator);
root_ = self.collapse_trailing_ws_line(root_, row, b_allocator); if (mode == .collapse_ws)
root_ = self.collapse_trailing_ws_line(root_, row, b_allocator);
const leading_ws_ = find_first_non_ws(root_, cursel.cursor.row, self.metrics); const leading_ws_ = find_first_non_ws(root_, cursel.cursor.row, self.metrics);
if (leading_ws_ > leading_ws and leading_ws_ > cursel.cursor.col) { if (leading_ws_ > leading_ws and leading_ws_ > cursel.cursor.col) {
const sel = try cursel.enable_selection(root_, self.metrics); const sel = try cursel.enable_selection(root_, self.metrics);
@ -4522,11 +4525,11 @@ pub const Editor = struct {
(std.mem.eql(u8, egc_right, "(") and std.mem.eql(u8, egc_left, ")")); (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, .collapse_ws);
if (smart_brace_indent) { if (smart_brace_indent) {
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, .leave_ws);
cursel.cursor = cursor; cursel.cursor = cursor;
if (indent_extra) if (indent_extra)
root = try self.indent_cursel(root, cursel, b.allocator); root = try self.indent_cursel(root, cursel, b.allocator);