summaryrefslogtreecommitdiff
path: root/src/edit.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-06 12:15:23 -0300
committerGabriel Schneider <[email protected]>2026-11-06 14:56:36 -0300
commit9b60771ffcd254772b716fafe488b09d9c2d3e0c (patch)
tree917b658065d2aa1b5b59c797249d1fa5d32c0983 /src/edit.zig
parent961bea06443e25a92e02be58136065c2a1ea84c1 (diff)
downloadpardes-9b60771ffcd254772b716fafe488b09d9c2d3e0c.tar.gz
pardes-9b60771ffcd254772b716fafe488b09d9c2d3e0c.zip
idioms #16, edits fail by name: the edit operations return edit.Error (memory, or a terminal's rows not read) and try where they caught and returned, so the key, chord or paste that ran one says the failure (`edit: out of memory`, reportError) where it did nothing; look, Core, File and terminal say theirs the same way, and the prints whose buffer provably fits catch unreachable with why
Co-Authored-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'src/edit.zig')
-rw-r--r--src/edit.zig330
1 files changed, 167 insertions, 163 deletions
diff --git a/src/edit.zig b/src/edit.zig
index 5fa18c2c..a7b9bb7a 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -28,6 +28,9 @@ const sel_slot = pardes.sel_slot;
const Effect = pardes.Effect;
const Pardes = pardes.Pardes;
const Registers = pardes.Registers;
+/// What an edit fails with, memory or a terminal's rows not read
+/// (terminal.shellRows); the key that ran it says so (`edit: out of memory`).
+pub const Error = error{ OutOfMemory, WriteFailed, UnknownPoint };
/// Write `text` as this range's value of the register the running command
/// names (`"<reg>`), the default one otherwise. `_` swallows it, and the
@@ -52,7 +55,7 @@ pub fn registerValue(p: *Pardes, t: *Text, name: u21) ?[]const u8 {
return switch (name) {
'_' => null,
'#' => std.fmt.allocPrint(p.scratch.allocator(), "{d}", .{i + 1}) catch null,
- '.' => selText(p, t),
+ '.' => selText(p, t) catch null,
'%' => if (t.what == .body) if (t.pane()) |pane| (if (pane.file) |f| f.path else null) else null else null,
else => p.registers.value(name, i),
};
@@ -60,7 +63,7 @@ pub fn registerValue(p: *Pardes, t: *Text, name: u21) ?[]const u8 {
/// the text of the range under the cursor: the selection, or the cursor's
/// own character
-fn selText(p: *Pardes, t: *Text) []const u8 {
+fn selText(p: *Pardes, t: *Text) Error![]const u8 {
const save = t.vsel;
defer t.vsel = save;
if (!t.vsel.active) t.vsel = .{ .active = true, .row = t.cur_row, .col = t.cur_col, .explicit = false };
@@ -73,7 +76,7 @@ fn selText(p: *Pardes, t: *Text) []const u8 {
/// Where a paste goes: after the selection, before it, or over it.
pub const Paste = enum { after, before, replace };
-pub fn pasteRegister(p: *Pardes, t: *Text, how: Paste, count: usize) void {
+pub fn pasteRegister(p: *Pardes, t: *Text, how: Paste, count: usize) Error!void {
const name: u21 = if (p.view().register != 0) p.view().register else Registers.default;
if (name == '+' or name == '*') {
if (!normal.multiOnce(p)) return;
@@ -82,9 +85,9 @@ pub fn pasteRegister(p: *Pardes, t: *Text, how: Paste, count: usize) void {
}
const y = registerValue(p, t, name) orelse return;
switch (how) {
- .after => pasteText(p, t, y, false, count),
- .before => pasteText(p, t, y, true, count),
- .replace => replaceWithText(p, t, y),
+ .after => try pasteText(p, t, y, false, count),
+ .before => try pasteText(p, t, y, true, count),
+ .replace => try replaceWithText(p, t, y),
}
}
@@ -105,11 +108,11 @@ pub fn clipRequest(p: *Pardes, id: usize, mode: Paste) void {
/// (terminal.encodePaste).
pub fn typeToTty(p: *Pardes, id: usize, pane: *const Pane, text: []const u8) void {
if (text.len == 0) return;
- const cp = p.scratch.allocator().dupe(u8, text) catch return;
+ const cp = p.scratch.allocator().dupe(u8, text) catch |err| return p.reportError(id, "paste", err);
for (panes.terminal.encodePaste(pane, cp)) |part| if (part.len > 0) p.emitWrite(id, part);
}
-pub fn applyPaste(p: *Pardes, whole: []const u8) void {
+pub fn applyPaste(p: *Pardes, whole: []const u8) Error!void {
const v = p.view();
// Every shell's paste comes through here, bounded: what is past the
// limit is left out, at a character's start, and said.
@@ -117,7 +120,7 @@ pub fn applyPaste(p: *Pardes, whole: []const u8) void {
const bytes = if (whole.len > limit) whole[0..modal.graphemeStart(whole, limit)] else whole;
if (whole.len > limit) {
var said: [96]u8 = undefined;
- p.setMessage(v.active, std.fmt.bufPrint(&said, "paste cut at its limit, {d} KiB: the rest left out", .{limit / 1024}) catch "paste cut at its limit");
+ p.setMessage(v.active, std.fmt.bufPrint(&said, "paste cut at its limit, {d} KiB: the rest left out", .{limit / 1024}) catch unreachable); // 67 bytes at most
}
// A prompt answering for a header takes the paste, as it takes keys.
const asking = if (p.panes[v.active]) |active| active.prompt != .none else false;
@@ -134,28 +137,28 @@ pub fn applyPaste(p: *Pardes, whole: []const u8) void {
v.active = id;
if (pane.prompt != .none and pane.prompt != .del_side and pane.prompt != .repl_choice) {
// an answer is one line: a newline in it would only be submitting it
- const line = p.scratch.allocator().alloc(u8, bytes.len) catch return;
+ const line = try p.scratch.allocator().alloc(u8, bytes.len);
var n: usize = 0;
for (bytes) |byte| if (byte != '\n' and byte != '\r') {
line[n] = byte;
n += 1;
};
- if (n > 0) insertKey(p, &pane.input, .{ .cp = line[0], .text = line[0..n] });
+ if (n > 0) try insertKey(p, &pane.input, .{ .cp = line[0], .text = line[0..n] });
if (normal.selRegexArmed(pane)) |a| if (panes.promptTarget(p, pane)) |t| normal.applySelRegex(p, pane, t, a.pat, a.mode);
return;
}
if (pane.focus == .tag) return pasteInto(p, &pane.tag, bytes);
if (pane.isTerminal() and pane.body.mode == .tty) return typeToTty(p, id, pane, bytes);
switch (if (req) |r| r.mode else .after) {
- .after => pasteText(p, &pane.body, bytes, false, 1),
- .before => pasteText(p, &pane.body, bytes, true, 1),
- .replace => replaceWithText(p, &pane.body, bytes),
+ .after => try pasteText(p, &pane.body, bytes, false, 1),
+ .before => try pasteText(p, &pane.body, bytes, true, 1),
+ .replace => try replaceWithText(p, &pane.body, bytes),
}
}
/// A paste into a tag or a header: typed at the caret while it is typed
/// into, after the cursor's cell in normal mode, as a body's paste is.
-fn pasteInto(p: *Pardes, t: *Text, bytes: []const u8) void {
+fn pasteInto(p: *Pardes, t: *Text, bytes: []const u8) Error!void {
if (bytes.len == 0) return;
const typed: pardes.Key = .{ .cp = bytes[0], .text = bytes };
if (t.what == .tag and t.mode == .insert) if (t.pane()) |pane| if (tagline.typedIntoName(p, pane, typed)) return;
@@ -164,7 +167,7 @@ fn pasteInto(p: *Pardes, t: *Text, bytes: []const u8) void {
const kept_n = t.nsel;
@memcpy(kept_sels[0..kept_n], t.sels[0..kept_n]);
t.refused = false;
- if (t.mode == .insert) insertKey(p, t, typed) else pasteText(p, t, bytes, false, 1);
+ if (t.mode == .insert) try insertKey(p, t, typed) else try pasteText(p, t, bytes, false, 1);
if (t.refused) {
t.cur_row, t.cur_col, t.vsel = kept;
t.restoreSels(kept_sels[0..kept_n]);
@@ -187,7 +190,7 @@ pub fn clipYank(p: *Pardes, pane: *Pane, main_only: bool) void {
} else {
const others = pane.body.nsel;
pane.body.nsel = 0;
- normalYank(p, &pane.body);
+ normalYank(p, &pane.body) catch |err| p.reportError(p.view().active, "edit", err);
pane.body.nsel = others;
}
}
@@ -354,7 +357,7 @@ pub fn spanHas(r: i32, c: i32, ar: i32, ac: i32, br: i32, bc: i32) bool {
pub fn currentSelText(p: *Pardes, pane: *Pane) ?[]const u8 {
if (pane.addon) |k| if (k.selection.len > 0) return k.selection;
if (!pane.body.vsel.active) return null;
- return vselText(p, &pane.body);
+ return vselText(p, &pane.body) catch null;
}
pub fn exitInsert(p: *Pardes, t: *Text) void {
@@ -366,7 +369,7 @@ pub fn exitInsert(p: *Pardes, t: *Text) void {
// helix enter_normal_mode: every range, from its start to the char
// before its end when it points forward, else to its end
const expl = t.vsel.active and t.vsel.explicit;
- const text = flatSurface(p, t) catch return;
+ const text = flatSurface(p, t) catch |err| return p.reportError(p.view().active, "edit", err);
var rs: [Text.max_selections]modal.Selection = undefined;
const got = t.ranges(text, 0, &rs);
for (rs[0..got.n]) |*r| {
@@ -378,7 +381,7 @@ pub fn exitInsert(p: *Pardes, t: *Text) void {
t.setRanges(text, rs[0..got.n], &.{}, got.pri, expl);
}
-pub fn paneCursorLines(p: *Pardes, t: *Text) ![]const []const u8 {
+pub fn paneCursorLines(p: *Pardes, t: *Text) Error![]const []const u8 {
const arena = p.scratch.allocator();
if (t.what != .body) {
const text = try flatSurface(p, t);
@@ -422,7 +425,7 @@ pub fn pinPaneCursor(p: *Pardes, t: *Text) void {
t.cur_col = paneByteAtDisplay(p, t, t.cur_row, 0, t.cur_col);
}
-pub fn flatSurface(p: *Pardes, t: *Text) ![]const u8 {
+pub fn flatSurface(p: *Pardes, t: *Text) Error![]const u8 {
switch (t.what) {
.body => {},
// the tag as it is shown: the keyboard reaches its prefix too
@@ -446,15 +449,15 @@ pub fn paneWrapWidth(p: *const Pardes, t: *Text) usize {
/// Route shared edit operations to the characters `t` edits: its own, or
/// for a body its file's content or its terminal's overlay.
-fn editText(p: *Pardes, t: *Text, lo: i32, hi: i32, col: i32) ?panes.EditText {
+fn editText(p: *Pardes, t: *Text, lo: i32, hi: i32, col: i32) Error!?panes.EditText {
// A tag or header nobody has changed shows its default; the first edit
// makes that default its own text.
if (t.what == .tag) {
const pane = t.pane() orelse return null;
- return .{ .text = tagline.tagText(p, p.scratch.allocator(), pane) catch return null, .row0 = 0 };
+ return .{ .text = try tagline.tagText(p, p.scratch.allocator(), pane), .row0 = 0 };
}
if (t.what != .body and t.what != .input and t.own == null)
- t.own = p.gpa.dupe(u8, flatSurface(p, t) catch return null) catch return null;
+ t.own = try p.gpa.dupe(u8, try flatSurface(p, t));
if (t.what != .body) return .{ .text = t.own orelse &.{}, .row0 = 0 };
const pane = t.pane() orelse return null;
if (pane.file) |f| return .{ .text = f.content, .row0 = 0 };
@@ -462,8 +465,8 @@ fn editText(p: *Pardes, t: *Text, lo: i32, hi: i32, col: i32) ?panes.EditText {
return panes.terminal.editText(p, pane, lo, hi, col);
}
-fn editTextEol(p: *Pardes, t: *Text, b: Bounds) ?panes.EditText {
- const eb = editText(p, t, b.lo_row, b.hi_row, -1) orelse return null;
+fn editTextEol(p: *Pardes, t: *Text, b: Bounds) Error!?panes.EditText {
+ const eb = (try editText(p, t, b.lo_row, b.hi_row, -1)) orelse return null;
const r: usize = @intCast(@max(0, b.hi_row - eb.row0));
// A file's own line count and line, from its index.
if (r + 1 < panes.File.textLineCount(t, eb.text)) return eb;
@@ -494,12 +497,12 @@ fn setEditTextSpan(p: *Pardes, t: *Text, new: []u8, known_end: ?modal.Cursor, sp
// caller reads the new text back, as a body's is kept.
defer retireEditText(p, new);
const pane = t.pane() orelse return;
- const prefix = tagline.pathPrefix(p, p.scratch.allocator(), pane) catch return;
+ const prefix = tagline.pathPrefix(p, p.scratch.allocator(), pane) catch |err| return p.reportError(p.view().active, "edit", err);
if (!std.mem.startsWith(u8, new, prefix)) {
t.refused = true;
return;
}
- const tail = p.gpa.dupe(u8, new[prefix.len..]) catch return;
+ const tail = p.gpa.dupe(u8, new[prefix.len..]) catch |err| return p.reportError(p.view().active, "edit", err);
if (t.own) |old| p.gpa.free(old);
t.own = tail;
return;
@@ -617,7 +620,7 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
const terminal = t.what == .body and if (t.pane()) |pane| pane.isTerminal() else false;
var now = text;
if (hi < text.len and gap >= text.len and !terminal) {
- const grown = std.mem.concat(p.gpa, u8, &.{ text, "\n" }) catch return;
+ const grown = std.mem.concat(p.gpa, u8, &.{ text, "\n" }) catch |err| return p.reportError(p.view().active, "edit", err);
setEditText(p, t, grown);
now = grown; // what setEditText keeps; `text` may be gone
}
@@ -642,12 +645,12 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
t.vsel.active = false;
const below = where == .open_below;
const abs: i32 = if (b) |bb| (if (below) bb.hi_row else bb.lo_row) else t.cur_row;
- const eb = editText(p, t, abs, abs, -1) orelse return;
+ const eb = (editText(p, t, abs, abs, -1) catch |err| return p.reportError(p.view().active, "edit", err)) orelse return;
const row: usize = @intCast(@max(0, abs - eb.row0));
const ind = modal.indentText(modal.lineSlice(eb.text, row));
const arena = p.scratch.allocator();
- const block_len = std.math.mul(usize, cnt, ind.len + 1) catch return;
- const block = arena.alloc(u8, block_len) catch return;
+ const block_len = std.math.mul(usize, cnt, ind.len + 1) catch return p.reportError(p.view().active, "edit", error.OutOfMemory);
+ const block = arena.alloc(u8, block_len) catch |err| return p.reportError(p.view().active, "edit", err);
var block_at: usize = 0;
for (0..cnt) |_| {
if (below) {
@@ -665,7 +668,7 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
.{ .row = row, .col = modal.lineSlice(eb.text, row).len }
else
.{ .row = row, .col = 0 };
- const new = modal.insertAt(p.gpa, eb.text, at, block) catch return;
+ const new = modal.insertAt(p.gpa, eb.text, at, block) catch |err| return p.reportError(p.view().active, "edit", err);
setEditText(p, t, new);
t.cur_row = @as(i32, @intCast(if (below) row + 1 else row)) + eb.row0;
t.cur_col = @intCast(ind.len);
@@ -688,11 +691,11 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) void {
}
pub fn handleInsert(p: *Pardes, t: *Text, key: Key) void {
- if (t.nsel == 0) return insertKey(p, t, key);
+ if (t.nsel == 0) return insertKey(p, t, key) catch |err| p.reportError(p.view().active, "edit", err);
normal.replaySels(p, t, .{ .insert = key });
}
-pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
+pub fn insertKey(p: *Pardes, t: *Text, key: Key) Error!void {
// helix aliases: normalize to the base key and re-dispatch
if (hit(key, config.insert_backspace_alias)) return insertKey(p, t, .{ .cp = Key.backspace });
if (hit(key, config.insert_enter_alias)) return insertKey(p, t, .{ .cp = Key.enter });
@@ -703,7 +706,7 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
t.reg_wait = false;
if (key.ctrl or key.alt or key.cp >= 0xF0000) return;
const y = registerValue(p, t, key.cp) orelse return;
- if (y.len > 0) insertKey(p, t, .{ .cp = key.cp, .text = y });
+ if (y.len > 0) try insertKey(p, t, .{ .cp = key.cp, .text = y });
return;
}
if (hit(key, config.insert_register)) {
@@ -722,9 +725,9 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) void {
const old_len = old.len;
const explicit = t.vsel.explicit;
t.vsel.active = false;
- insertEdit(p, t, key);
+ try insertEdit(p, t, key);
if (t.mode != .insert) return;
- const new = flatSurface(p, t) catch return;
+ const new = try flatSurface(p, t);
const c2 = modal.offsetAt(new, .{ .row = @intCast(@max(0, t.cur_row)), .col = @intCast(@max(0, t.cur_col)) });
// every insert-mode edit happens at the cursor: an insertion there, or
// a deletion that ends there (backward) or starts there (forward)
@@ -777,13 +780,13 @@ fn mapThroughEdit(pos: usize, at: usize, del: usize, ins: usize, before: bool) u
return pos + ins;
}
-fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
+fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void {
t.vsel.active = false;
if (!t.cur_pinned) pinPaneCursor(p, t);
_ = clampFileCursor(t);
switch (key.cp) {
Key.left, Key.right, Key.up, Key.down => {
- const lines = paneCursorLines(p, t) catch return;
+ const lines = try paneCursorLines(p, t);
const cur0 = t.toModalCursor();
// In a pane's tag, Up on its first line collapses it and Down
// on its last expands it, where they would move nothing; acme's
@@ -812,7 +815,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
Key.page_up, Key.page_down => {
// helix binds insert pageup/pagedown to the same view
// scroll + cursor snap as normal mode
- const flat = flatSurface(p, t) catch return;
+ const flat = try flatSurface(p, t);
const range = t.primaryRange(flat, 0);
if (t.what != .body) return;
const step: i32 = @intCast(@max(1, (t.pane() orelse return).rows));
@@ -827,7 +830,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
},
Key.end => {
// helix insert End: past the last char (goto_line_end_newline)
- const text = flatSurface(p, t) catch return;
+ const text = try flatSurface(p, t);
const cur0 = t.toModalCursor();
t.cur_col = @intCast(panes.File.textLine(t, text, cur0.row).len);
t.cur_pinned = true;
@@ -836,7 +839,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
},
else => {},
}
- const eb = editText(p, t, t.cur_row, t.cur_row, t.cur_col) orelse return;
+ const eb = (try editText(p, t, t.cur_row, t.cur_row, t.cur_col)) orelse return;
const text = eb.text;
const c = modal.Cursor{ .row = @intCast(@max(0, t.cur_row - eb.row0)), .col = @intCast(@max(0, t.cur_col)) };
if (key.text.len > 0 and !key.ctrl and !key.alt) {
@@ -852,7 +855,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
if (!panes.File.replace(p, f, at, 0, key.text)) return;
t.last_edit = .{ .row = @intCast(end.row), .col = @intCast(end.col) };
} else {
- const new = modal.spliceAlloc(p.gpa, text, at, at, key.text) catch return;
+ const new = try modal.spliceAlloc(p.gpa, text, at, at, key.text);
setEditTextSpan(p, t, new, end, .{ .head = at, .tail = text.len - at });
}
t.cur_row = @as(i32, @intCast(end.row)) + eb.row0;
@@ -864,7 +867,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
// helix insert-mode kills (word/line; deleteSpan is exclusive)
if (hit(key, config.delete_word_backward)) {
const e2 = if (c.row == 0 and c.col == 0)
- (editText(p, t, t.cur_row - 1, t.cur_row, 0) orelse return)
+ ((try editText(p, t, t.cur_row - 1, t.cur_row, 0)) orelse return)
else
eb;
const c2 = modal.Cursor{ .row = @intCast(@max(0, t.cur_row - e2.row0)), .col = c.col };
@@ -873,7 +876,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
const wr = modal.moveWord(e2.text, .{ .anchor = g, .head = g }, 1, .prev_word_start);
const from = @min(wr.anchor, wr.head);
const fc = modal.positionAt(e2.text, from);
- const new = modal.deleteSpan(p.gpa, e2.text, fc, c2) catch return;
+ const new = try modal.deleteSpan(p.gpa, e2.text, fc, c2);
setEditTextEnd(p, t, new, fc);
t.cur_row = @as(i32, @intCast(fc.row)) + e2.row0;
t.cur_col = @intCast(fc.col);
@@ -883,7 +886,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
}
if (hit(key, config.delete_word_forward)) {
const e2 = if (c.col >= modal.lineSlice(text, c.row).len and c.row + 1 >= modal.lineCount(text))
- (editText(p, t, t.cur_row, t.cur_row + 1, t.cur_col) orelse return)
+ ((try editText(p, t, t.cur_row, t.cur_row + 1, t.cur_col)) orelse return)
else
eb;
const c2 = modal.Cursor{ .row = @intCast(@max(0, t.cur_row - e2.row0)), .col = c.col };
@@ -891,13 +894,13 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
const wr = modal.moveWord(e2.text, .{ .anchor = g, .head = g }, 1, .next_word_end);
const to = @max(wr.anchor, wr.head);
if (to <= g) return;
- const new = modal.deleteSpan(p.gpa, e2.text, c2, modal.positionAt(e2.text, to)) catch return;
+ const new = try modal.deleteSpan(p.gpa, e2.text, c2, modal.positionAt(e2.text, to));
setEditTextEnd(p, t, new, c2);
t.cur_pinned = true;
return;
}
if (hit(key, config.kill_to_line_start)) {
- const new = modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = 0 }, c) catch return;
+ const new = try modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = 0 }, c);
setEditTextEnd(p, t, new, .{ .row = c.row, .col = 0 });
t.cur_col = 0;
t.cur_pinned = true;
@@ -906,7 +909,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
}
if (hit(key, config.kill_to_line_end)) {
const llen = modal.lineSlice(text, c.row).len;
- const new = modal.deleteSpan(p.gpa, text, c, .{ .row = c.row, .col = llen }) catch return;
+ const new = try modal.deleteSpan(p.gpa, text, c, .{ .row = c.row, .col = llen });
setEditTextEnd(p, t, new, c);
t.cur_pinned = true;
return;
@@ -919,7 +922,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
// itself moves down, blanks and all; else the blanks before the
// cursor go and the new line takes the indent
if (std.mem.indexOfNone(u8, before, " \t") == null) {
- const new = modal.insertAt(p.gpa, text, .{ .row = c.row, .col = 0 }, "\n") catch return;
+ const new = try modal.insertAt(p.gpa, text, .{ .row = c.row, .col = 0 }, "\n");
setEditTextEnd(p, t, new, .{ .row = c.row + 1, .col = 0 });
t.cur_row += 1;
t.cur_pinned = true;
@@ -934,16 +937,16 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
const tabbed = std.mem.indexOfScalar(u8, lead, '\t') != null;
const indent = lead.len + (if (more == 0) 0 else if (tabbed) 1 else more);
const arena = p.scratch.allocator();
- const block = arena.alloc(u8, 1 + indent) catch return;
+ const block = try arena.alloc(u8, 1 + indent);
block[0] = '\n';
@memcpy(block[1..][0..lead.len], lead);
@memset(block[1 + lead.len ..], if (tabbed) '\t' else ' ');
// a tag keeps its blanks: they part its words, and the last
// may be its read-only prefix's
const kept = if (t.what == .body) std.mem.trimEnd(u8, before, " \t").len else c.col;
- const cut = modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = kept }, c) catch return;
+ const cut = try modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = kept }, c);
defer p.gpa.free(cut);
- const new = modal.insertAt(p.gpa, cut, .{ .row = c.row, .col = kept }, block) catch return;
+ const new = try modal.insertAt(p.gpa, cut, .{ .row = c.row, .col = kept }, block);
setEditTextEnd(p, t, new, .{ .row = c.row + 1, .col = indent });
t.cur_row += 1;
t.cur_col = @intCast(indent);
@@ -975,7 +978,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
if (!(if (e > s) panes.File.replace(p, f, s, e - s, "") else panes.File.replace(p, f, text.len, 0, ""))) return;
t.last_edit = .{ .row = @intCast(c.row), .col = @intCast(prev) };
} else {
- const new = if (e > s) modal.spliceAlloc(p.gpa, text, s, e, "") catch return else p.gpa.dupe(u8, text) catch return;
+ const new = if (e > s) try modal.spliceAlloc(p.gpa, text, s, e, "") else try p.gpa.dupe(u8, text);
const span: panes.File.Span = if (e > s) .{ .head = s, .tail = text.len - e } else .{ .head = text.len, .tail = 0 };
setEditTextSpan(p, t, new, .{ .row = c.row, .col = prev }, span);
}
@@ -987,11 +990,11 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
// at col 0: eat the newline above (join up) — a terminal grows
// its buffer over the row it is joining with
if (t.cur_row <= 0) return;
- const e2 = editText(p, t, t.cur_row - 1, t.cur_row, 0) orelse return;
+ const e2 = (try editText(p, t, t.cur_row - 1, t.cur_row, 0)) orelse return;
const row: usize = @intCast(@max(0, t.cur_row - e2.row0));
if (row == 0) return;
const prevlen = modal.lineSlice(e2.text, row - 1).len;
- const new = modal.deleteSpan(p.gpa, e2.text, .{ .row = row - 1, .col = prevlen }, .{ .row = row, .col = 0 }) catch return;
+ const new = try modal.deleteSpan(p.gpa, e2.text, .{ .row = row - 1, .col = prevlen }, .{ .row = row, .col = 0 });
setEditTextEnd(p, t, new, .{ .row = row - 1, .col = prevlen });
t.cur_row -= 1;
t.cur_col = @intCast(prevlen);
@@ -1004,13 +1007,13 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
const line = modal.lineSlice(text, c.row);
if (c.col < line.len) {
const at = modal.offsetAt(text, c);
- const new = modal.spliceAlloc(p.gpa, text, at, modal.nextGrapheme(text, at), "") catch return;
+ const new = try modal.spliceAlloc(p.gpa, text, at, modal.nextGrapheme(text, at), "");
setEditTextEnd(p, t, new, c);
} else {
- const e2 = editText(p, t, t.cur_row, t.cur_row + 1, t.cur_col) orelse return;
+ const e2 = (try editText(p, t, t.cur_row, t.cur_row + 1, t.cur_col)) orelse return;
const row: usize = @intCast(@max(0, t.cur_row - e2.row0));
if (row + 1 >= modal.lineCount(e2.text)) return;
- const new = modal.deleteSpan(p.gpa, e2.text, .{ .row = row, .col = c.col }, .{ .row = row + 1, .col = 0 }) catch return;
+ const new = try modal.deleteSpan(p.gpa, e2.text, .{ .row = row, .col = c.col }, .{ .row = row + 1, .col = 0 });
setEditTextEnd(p, t, new, .{ .row = row, .col = c.col });
}
t.cur_pinned = true;
@@ -1043,13 +1046,13 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) void {
}
pub fn insertTab(p: *Pardes, t: *Text) void {
- const eb = editText(p, t, t.cur_row, t.cur_row, t.cur_col) orelse return;
+ const eb = (editText(p, t, t.cur_row, t.cur_row, t.cur_col) catch |err| return p.reportError(p.view().active, "edit", err)) orelse return;
const c: modal.Cursor = .{
.row = @intCast(@max(0, t.cur_row - eb.row0)),
.col = @intCast(@max(0, t.cur_col)),
};
const pad = modal.INDENT_W - (c.col % modal.INDENT_W);
- const new = modal.insertAt(p.gpa, eb.text, c, " "[0..pad]) catch return;
+ const new = modal.insertAt(p.gpa, eb.text, c, " "[0..pad]) catch |err| return p.reportError(p.view().active, "edit", err);
setEditTextEnd(p, t, new, .{ .row = c.row, .col = c.col + pad });
t.cur_col += @intCast(pad);
t.cur_pinned = true;
@@ -1070,22 +1073,22 @@ fn vselBounds(t: *Text) Bounds {
return cellBounds(.{ .row = t.cur_row, .col = t.cur_col, .arow = t.vsel.row, .acol = t.vsel.col });
}
-fn vselText(p: *Pardes, t: *Text) []const u8 {
- const text = flatSurface(p, t) catch return "";
+fn vselText(p: *Pardes, t: *Text) Error![]const u8 {
+ const text = try flatSurface(p, t);
const r = t.primaryRange(text, 0);
- return p.scratch.allocator().dupe(u8, text[@min(r.anchor, r.head)..@max(r.anchor, r.head)]) catch "";
+ return p.scratch.allocator().dupe(u8, text[@min(r.anchor, r.head)..@max(r.anchor, r.head)]);
}
-pub fn normalDelete(p: *Pardes, t: *Text, yank: bool) void {
+pub fn normalDelete(p: *Pardes, t: *Text, yank: bool) Error!void {
t.select = false; // helix delete exits select mode
t.sticky_col = -1;
// A bare cursor is the 1-wide selection on its cell (helix), a '\n'
// cell too, where the delete joins the lines.
if (!t.vsel.active) t.vsel = .{ .active = true, .row = t.cur_row, .col = t.cur_col, .explicit = false };
const b = vselBounds(t);
- if (yank) setYank(p, vselText(p, t)); // read the range before the move
+ if (yank) setYank(p, try vselText(p, t)); // read the range before the move
pushUndo(p, t);
- const eb = editTextEol(p, t, b) orelse {
+ const eb = (try editTextEol(p, t, b)) orelse {
t.vsel.active = false;
return;
};
@@ -1096,16 +1099,16 @@ pub fn normalDelete(p: *Pardes, t: *Text, yank: bool) void {
t.clampCursor(new, eb.row0);
}
-pub fn normalYank(p: *Pardes, t: *Text) void {
+pub fn normalYank(p: *Pardes, t: *Text) Error!void {
t.select = false;
if (t.what == .body) if (t.pane()) |pane| if (pane.rawPointerText(pane.sel[sel_slot])) |text| {
setYank(p, text);
return;
};
- setYank(p, if (t.vsel.active) vselText(p, t) else selText(p, t));
+ setYank(p, try if (t.vsel.active) vselText(p, t) else selText(p, t));
}
-pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usize) void {
+pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usize) Error!void {
if (y0.len == 0) return;
pushUndo(p, t);
t.select = false;
@@ -1113,8 +1116,8 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz
const arena = p.scratch.allocator();
var y: []const u8 = y0;
if (count > 1) {
- const total = std.math.mul(usize, count, y0.len) catch return;
- const buf = arena.alloc(u8, total) catch return;
+ const total = std.math.mul(usize, count, y0.len) catch return error.OutOfMemory;
+ const buf = try arena.alloc(u8, total);
for (0..count) |i| @memcpy(buf[i * y0.len ..][0..y0.len], y0);
y = buf;
}
@@ -1122,7 +1125,7 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz
vselBounds(t)
else
.{ .lo_row = t.cur_row, .lo_col = t.cur_col, .hi_row = t.cur_row, .hi_col = t.cur_col };
- const eb = editText(p, t, b.lo_row, b.hi_row, -1) orelse return;
+ const eb = (try editText(p, t, b.lo_row, b.hi_row, -1)) orelse return;
const row0 = eb.row0;
if (y[y.len - 1] == '\n') {
const block_text = y[0 .. y.len - 1];
@@ -1130,12 +1133,12 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz
var out: []u8 = undefined;
if (before) {
const row: usize = @intCast(@max(0, b.lo_row - row0));
- const block = std.fmt.allocPrint(arena, "{s}\n", .{block_text}) catch return;
- out = modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = 0 }, block) catch return;
+ const block = try std.fmt.allocPrint(arena, "{s}\n", .{block_text});
+ out = try modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = 0 }, block);
t.cur_row = @as(i32, @intCast(row + n - 1)) + row0;
} else {
const row: usize = @intCast(@max(0, b.hi_row - row0));
- out = modal.pasteLineBelow(p.gpa, eb.text, row, block_text) catch return;
+ out = try modal.pasteLineBelow(p.gpa, eb.text, row, block_text);
t.cur_row = @as(i32, @intCast(row + n)) + row0;
}
setEditText(p, t, out);
@@ -1154,7 +1157,7 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz
const gcol = modal.nextGrapheme(high_line, hi_col);
break :blk .{ .row = hrow, .col = gcol };
};
- const out = modal.insertAt(p.gpa, eb.text, at, y) catch return;
+ const out = try modal.insertAt(p.gpa, eb.text, at, y);
setEditText(p, t, out);
t.vsel = .{ .active = modal.nextGrapheme(y, 0) < y.len, .row = @as(i32, @intCast(at.row)) + row0, .col = @intCast(at.col), .explicit = false };
const end = modal.advanceBy(at, y);
@@ -1170,24 +1173,24 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz
t.show();
}
-pub fn normalChange(p: *Pardes, t: *Text) void {
+pub fn normalChange(p: *Pardes, t: *Text) Error!void {
t.select = false;
t.sticky_col = -1;
if (t.vsel.active) {
const b = vselBounds(t);
- const eb = editTextEol(p, t, b) orelse return;
+ const eb = (try editTextEol(p, t, b)) orelse return;
const hi_len = modal.lineSlice(eb.text, @intCast(@max(0, b.hi_row - eb.row0))).len;
if (b.lo_col == 0 and @as(usize, @intCast(@max(0, b.hi_col))) >= hi_len) {
- setYank(p, vselText(p, t));
+ setYank(p, try vselText(p, t));
pushUndo(p, t);
- const d = modal.deleteLines(p.gpa, eb.text, @intCast(@max(0, b.lo_row - eb.row0)), @intCast(@max(0, b.hi_row - eb.row0))) catch return;
+ const d = try modal.deleteLines(p.gpa, eb.text, @intCast(@max(0, b.lo_row - eb.row0)), @intCast(@max(0, b.hi_row - eb.row0)));
setEditText(p, t, d);
const n = modal.lineCount(d);
const row: usize = @min(@as(usize, @intCast(@max(0, b.lo_row - eb.row0))), if (n == 0) 0 else n - 1);
const ind = modal.indentText(modal.lineSlice(d, row));
const arena = p.scratch.allocator();
- const block = std.fmt.allocPrint(arena, "{s}\n", .{ind}) catch return;
- const new = modal.insertAt(p.gpa, d, .{ .row = row, .col = 0 }, block) catch return;
+ const block = try std.fmt.allocPrint(arena, "{s}\n", .{ind});
+ const new = try modal.insertAt(p.gpa, d, .{ .row = row, .col = 0 }, block);
setEditText(p, t, new);
t.cur_row = @as(i32, @intCast(row)) + eb.row0;
t.cur_col = @intCast(ind.len);
@@ -1198,7 +1201,7 @@ pub fn normalChange(p: *Pardes, t: *Text) void {
t.show();
return;
}
- setYank(p, vselText(p, t));
+ setYank(p, try vselText(p, t));
pushUndo(p, t);
const new = deleteSelection(p, t, eb) orelse return;
setEditText(p, t, new);
@@ -1210,10 +1213,10 @@ pub fn normalChange(p: *Pardes, t: *Text) void {
return;
}
pushUndo(p, t);
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const r = t.primaryRange(eb.text, eb.row0);
setYank(p, eb.text[r.anchor..r.head]);
- const new = modal.spliceAlloc(p.gpa, eb.text, r.anchor, r.head, "") catch return;
+ const new = try modal.spliceAlloc(p.gpa, eb.text, r.anchor, r.head, "");
setEditText(p, t, new);
const llen = modal.lineSlice(new, @intCast(@max(0, t.cur_row - eb.row0))).len;
t.cur_col = @min(t.cur_col, @as(i32, @intCast(llen)));
@@ -1250,7 +1253,7 @@ fn allSelRows(t: *Text) Bounds {
/// Put in `new`, an edit of the buffer whose first line is surface row
/// `row0`, and select `cells`, each range's cursor and anchor cells in it.
-fn setEditCells(p: *Pardes, t: *Text, new: []u8, row0: i32, cells: []const Text.Cells, pri: usize, expl: bool) void {
+fn setEditCells(p: *Pardes, t: *Text, new: []u8, row0: i32, cells: []const Text.Cells, pri: usize, expl: bool) Error!void {
var sels: [Text.max_selections]Text.SelRange = undefined;
for (cells, sels[0..cells.len]) |c, *s| {
const cc = modal.positionAt(new, c.cur);
@@ -1258,7 +1261,7 @@ fn setEditCells(p: *Pardes, t: *Text, new: []u8, row0: i32, cells: []const Text.
s.* = .{ .row = @as(i32, @intCast(cc.row)) + row0, .col = @intCast(cc.col), .arow = @as(i32, @intCast(ac.row)) + row0, .acol = @intCast(ac.col) };
}
setEditText(p, t, new);
- const text = flatSurface(p, t) catch return;
+ const text = try flatSurface(p, t);
var rs: [Text.max_selections]modal.Selection = undefined;
for (sels[0..cells.len], rs[0..cells.len]) |s, *r| r.* = Text.cellRange(text, s.arow, s.acol, s.row, s.col);
t.setRanges(text, rs[0..cells.len], &.{}, pri, expl);
@@ -1266,9 +1269,9 @@ fn setEditCells(p: *Pardes, t: *Text, new: []u8, row0: i32, cells: []const Text.
/// `r<ch>`: overwrite the selection (or the cursor char) with ch —
/// newlines included (helix), so `xrz` joins the selected lines
-pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) void {
+pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) Error!void {
t.select = false;
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const before = t.primaryRange(eb.text, eb.row0);
const lo = @min(before.anchor, before.head);
const hi = @max(before.anchor, before.head);
@@ -1276,11 +1279,12 @@ pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) void {
var at = lo;
while (at < hi) : (graphemes += 1) at = modal.nextGrapheme(eb.text, at);
var encoded: [4]u8 = undefined;
- const encoded_len = std.unicode.utf8Encode(ch, &encoded) catch return;
- const rep = p.scratch.allocator().alloc(u8, graphemes * encoded_len) catch return;
+ if (!std.unicode.utf8ValidCodepoint(ch)) return; // a surrogate half types nothing
+ const encoded_len = std.unicode.utf8Encode(ch, &encoded) catch unreachable; // a valid code point, checked above
+ const rep = try p.scratch.allocator().alloc(u8, graphemes * encoded_len);
for (0..graphemes) |i| @memcpy(rep[i * encoded_len ..][0..encoded_len], encoded[0..encoded_len]);
pushUndo(p, t);
- const new = modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep) catch return;
+ const new = try modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep);
setEditText(p, t, new);
const end = lo + rep.len;
const mapped: modal.Selection = if (before.head < before.anchor)
@@ -1293,21 +1297,21 @@ pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) void {
/// `R`: replace the selection (or the cursor char) with the DEFAULT
/// register. `SPC R` is the same verb over the system clipboard.
/// The acme chords' replace: the default register as one text.
-pub fn chordReplace(p: *Pardes, t: *Text) void {
- replaceWithText(p, t, p.registers.text(p.gpa, Registers.default) orelse return);
+pub fn chordReplace(p: *Pardes, t: *Text) Error!void {
+ return replaceWithText(p, t, p.registers.text(p.gpa, Registers.default) orelse return);
}
/// The pasted text becomes the selection, in the direction the replaced one
/// had: a forward head lands on its last char (which for a trailing-newline
/// `y` is the '\n' cell of the last full line), a backward one on its first.
-fn replaceWithText(p: *Pardes, t: *Text, y: []const u8) void {
+fn replaceWithText(p: *Pardes, t: *Text, y: []const u8) Error!void {
if (y.len == 0) return;
t.select = false;
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const r = t.primaryRange(eb.text, eb.row0);
const lo = @min(r.anchor, r.head);
pushUndo(p, t);
- const new = modal.spliceAlloc(p.gpa, eb.text, lo, @max(r.anchor, r.head), y) catch return;
+ const new = try modal.spliceAlloc(p.gpa, eb.text, lo, @max(r.anchor, r.head), y);
setEditText(p, t, new);
const end = lo + y.len;
t.setRange(new, eb.row0, if (r.head < r.anchor) .{ .anchor = end, .head = lo } else .{ .anchor = lo, .head = end }, false);
@@ -1315,12 +1319,12 @@ fn replaceWithText(p: *Pardes, t: *Text, y: []const u8) void {
/// `~` / `` ` `` / ``Alt-` ``: case-map the selection (or the cursor char),
/// keeping the selection (helix)
-pub fn normalCase(p: *Pardes, t: *Text, op: modal.CaseOp) void {
+pub fn normalCase(p: *Pardes, t: *Text, op: modal.CaseOp) Error!void {
t.select = false;
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const r = t.primaryRange(eb.text, eb.row0);
pushUndo(p, t);
- const new = modal.changeCase(p.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), op) catch return;
+ const new = try modal.changeCase(p.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), op);
setEditText(p, t, new);
}
@@ -1344,12 +1348,12 @@ fn mapThroughChanges(chs: []const sam.Op, pos: usize) usize {
/// (helix join_selections): the newline and the next line's leading blanks
/// become one space, or nothing when that line is blank, and a line two
/// ranges share is joined once. `Alt-J` then selects the spaces it put in.
-pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) void {
+pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) Error!void {
const expl = t.vsel.active and t.vsel.explicit;
// a join always eats the newline of its last line, so the buffer has
// to reach one row PAST every range
const b = allSelRows(t);
- const eb = editText(p, t, b.lo_row, b.hi_row + 1, -1) orelse return;
+ const eb = (try editText(p, t, b.lo_row, b.hi_row + 1, -1)) orelse return;
const text = eb.text;
var rs: [Text.max_selections]modal.Selection = undefined;
const got = t.ranges(text, eb.row0, &rs);
@@ -1373,7 +1377,7 @@ pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) void {
while (to < text.len and (text[to] == ' ' or text[to] == '\t')) to += 1;
const last = @min(l + 1, nlines - 1);
const sep: []const u8 = if (to == panes.File.textLineStart(t, text, last) + panes.File.textLine(t, text, last).len) "" else " ";
- changes.append(arena, .{ .q0 = @intCast(from), .q1 = @intCast(to), .text = sep }) catch return;
+ try changes.append(arena, .{ .q0 = @intCast(from), .q1 = @intCast(to), .text = sep });
}
next = @max(next, end);
}
@@ -1381,7 +1385,7 @@ pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) void {
const chs_len = chs.len;
if (chs_len == 0) return;
pushUndo(p, t);
- const new = sam.apply(p.gpa, text, chs[0..chs_len]) catch return;
+ const new = try sam.apply(p.gpa, text, chs[0..chs_len]);
// every range's cells ride through the edit; Alt-J replaces them with
// the spaces, when it put any in
var cells: [Text.max_selections]Text.Cells = undefined;
@@ -1406,16 +1410,16 @@ pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) void {
n = got.n;
pri = got.pri;
}
- setEditCells(p, t, new, eb.row0, cells[0..n], pri, expl);
+ try setEditCells(p, t, new, eb.row0, cells[0..n], pri, expl);
}
/// `Alt-)` / `Alt-(`: rotate the TEXT of the selections forward / back by
/// one range (count ranges), in one edit (helix reorder_selection_contents).
/// Each range comes back over the text it now holds, in its own direction,
/// and the primary moves with the text it had.
-pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) void {
+pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) Error!void {
const expl = t.vsel.active and t.vsel.explicit;
- const eb = editTextEol(p, t, allSelRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, allSelRows(t))) orelse return;
const text = eb.text;
var rs: [Text.max_selections]modal.Selection = undefined;
const got = t.ranges(text, eb.row0, &rs);
@@ -1432,7 +1436,7 @@ pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) voi
};
}
pushUndo(p, t);
- const new = sam.apply(p.gpa, text, chs[0..n]) catch return;
+ const new = try sam.apply(p.gpa, text, chs[0..n]);
var cells: [Text.max_selections]Text.Cells = undefined;
var delta: i64 = 0;
for (chs[0..n], rs[0..n], cells[0..n]) |ch, r, *cell| {
@@ -1441,16 +1445,16 @@ pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) voi
const to = from + ch.text.len;
cell.* = Text.rangeCells(new, if (r.anchor > r.head) .{ .anchor = to, .head = from } else .{ .anchor = from, .head = to });
}
- setEditCells(p, t, new, eb.row0, cells[0..n], if (forward) (got.pri + by) % n else (got.pri + n - by) % n, expl);
+ try setEditCells(p, t, new, eb.row0, cells[0..n], if (forward) (got.pri + by) % n else (got.pri + n - by) % n, expl);
}
/// `&`: pad the selections into columns, in one edit (helix
/// align_selections). The k-th range of every line is a column; spaces go in
/// before each range so its head lands on the column's widest head, measured
/// in display cells. A range over several lines aligns nothing.
-pub fn normalAlign(p: *Pardes, t: *Text) void {
+pub fn normalAlign(p: *Pardes, t: *Text) Error!void {
const expl = t.vsel.active and t.vsel.explicit;
- const eb = editTextEol(p, t, allSelRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, allSelRows(t))) orelse return;
const text = eb.text;
var rs: [Text.max_selections]modal.Selection = undefined;
const got = t.ranges(text, eb.row0, &rs);
@@ -1492,7 +1496,7 @@ pub fn normalAlign(p: *Pardes, t: *Text) void {
k += 1;
run += pad;
if (pad == 0) continue;
- const spaces = arena.alloc(u8, pad) catch return;
+ const spaces = try arena.alloc(u8, pad);
@memset(spaces, ' ');
const at = @min(r.anchor, r.head);
chs[m] = .{ .q0 = @intCast(at), .q1 = @intCast(at), .text = spaces };
@@ -1500,27 +1504,27 @@ pub fn normalAlign(p: *Pardes, t: *Text) void {
}
if (m == 0) return;
pushUndo(p, t);
- const new = sam.apply(p.gpa, text, chs[0..m]) catch return;
+ const new = try sam.apply(p.gpa, text, chs[0..m]);
var cells: [Text.max_selections]Text.Cells = undefined;
for (rs[0..n], cells[0..n]) |r, *cell| {
const c = Text.rangeCells(text, r);
cell.* = .{ .cur = mapThroughChanges(chs[0..m], c.cur), .anc = mapThroughChanges(chs[0..m], c.anc) };
}
- setEditCells(p, t, new, eb.row0, cells[0..n], got.pri, expl);
+ try setEditCells(p, t, new, eb.row0, cells[0..n], got.pri, expl);
}
-pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) void {
+pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) Error!void {
t.select = false;
const sr = selRows(t);
- const eb = editText(p, t, sr.lo_row, sr.hi_row, -1) orelse return;
+ const eb = (try editText(p, t, sr.lo_row, sr.hi_row, -1)) orelse return;
const text = eb.text;
const range = t.primaryRange(text, eb.row0);
const span = Text.rangeLineSpan(text, range);
const arena = p.scratch.allocator();
// one run of spaces, sliced per line: `>` never inserts more than this
- const pad = arena.alloc(u8, modal.INDENT_W * cnt) catch return;
+ const pad = try arena.alloc(u8, modal.INDENT_W * cnt);
@memset(pad, ' ');
- const chs = arena.alloc(sam.Op, span.end - span.start + 1) catch return;
+ const chs = try arena.alloc(sam.Op, span.end - span.start + 1);
var chs_len: usize = 0;
var l = span.start;
while (l <= span.end) : (l += 1) {
@@ -1559,7 +1563,7 @@ pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) void {
modal.offsetAt(text, .{ .row = @intCast(@max(0, t.vsel.row - eb.row0)), .col = @intCast(@max(0, t.vsel.col)) })
else
cur_off;
- const new = sam.apply(p.gpa, text, chs[0..chs_len]) catch return;
+ const new = try sam.apply(p.gpa, text, chs[0..chs_len]);
const nc = mapThroughChanges(chs[0..chs_len], cur_off);
const na = mapThroughChanges(chs[0..chs_len], anc_off);
setEditText(p, t, new);
@@ -1576,14 +1580,14 @@ pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) void {
t.show();
}
-pub fn normalToggleComment(p: *Pardes, t: *Text) void {
+pub fn normalToggleComment(p: *Pardes, t: *Text) Error!void {
const expl = t.vsel.active and t.vsel.explicit;
t.select = false; // helix exit_select_mode
// the buffer must cover every cursor's rows, not just the primary's
const b = allSelRows(t);
- const surface = flatSurface(p, t) catch return;
+ const surface = try flatSurface(p, t);
const last_row = @as(i32, @intCast(panes.File.textLineCount(t, surface))) - 1;
- const eb = editText(p, t, b.lo_row, @min(b.hi_row + 1, last_row), -1) orelse return;
+ const eb = (try editText(p, t, b.lo_row, @min(b.hi_row + 1, last_row), -1)) orelse return;
const text = eb.text;
var rs: [Text.max_selections]modal.Selection = undefined;
const got = t.ranges(text, eb.row0, &rs);
@@ -1591,7 +1595,7 @@ pub fn normalToggleComment(p: *Pardes, t: *Text) void {
const arena = p.scratch.allocator();
// the lines the ranges cover, each ONE ONCE and in order (helix's
// min_next_line: two cursors on one line comment it once)
- const lines = arena.alloc(usize, nlines) catch return;
+ const lines = try arena.alloc(usize, nlines);
var lines_len: usize = 0;
var next: usize = 0;
for (rs[0..got.n]) |r| {
@@ -1627,8 +1631,8 @@ pub fn normalToggleComment(p: *Pardes, t: *Text) void {
live += 1;
}
if (live == 0) return; // nothing but blank lines
- const ins = std.fmt.allocPrint(arena, "{s} ", .{token}) catch return;
- const chs = arena.alloc(sam.Op, lines_len) catch return;
+ const ins = try std.fmt.allocPrint(arena, "{s} ", .{token});
+ const chs = try arena.alloc(sam.Op, lines_len);
var chs_len: usize = 0;
for (lines[0..lines_len]) |l| {
const ls = modal.lineStartOffset(text, l);
@@ -1648,41 +1652,41 @@ pub fn normalToggleComment(p: *Pardes, t: *Text) void {
// one edit, and the WHOLE selection rides through it (helix maps the
// selection with the transaction)
var cells: [Text.max_selections]Text.Cells = undefined;
- const new = sam.apply(p.gpa, text, chs[0..chs_len]) catch return;
+ const new = try sam.apply(p.gpa, text, chs[0..chs_len]);
for (rs[0..got.n], cells[0..got.n]) |r, *cell| cell.* = Text.rangeCells(new, .{
.anchor = mapThroughChanges(chs[0..chs_len], r.anchor),
.head = mapThroughChanges(chs[0..chs_len], r.head),
});
- setEditCells(p, t, new, eb.row0, cells[0..got.n], got.pri, expl);
+ try setEditCells(p, t, new, eb.row0, cells[0..got.n], got.pri, expl);
}
-pub fn normalAdjustNumber(p: *Pardes, t: *Text, delta: i64) void {
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+pub fn normalAdjustNumber(p: *Pardes, t: *Text, delta: i64) Error!void {
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const r = t.primaryRange(eb.text, eb.row0);
const lo = @min(r.anchor, r.head);
const hi = @max(r.anchor, r.head);
const rep = (modal.incrementDecimal(p.scratch.allocator(), eb.text[lo..hi], delta) catch null) orelse return;
pushUndo(p, t);
t.select = false;
- const new = modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep) catch return;
+ const new = try modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep);
setEditText(p, t, new);
t.setRange(new, eb.row0, .{ .anchor = lo, .head = lo + rep.len }, false);
}
/// `]Space` / `[Space`: add blank lines below/above, the cursor staying
/// on its text line (the selection rides along)
-pub fn addNewline(p: *Pardes, t: *Text, below: bool, cnt: usize) void {
+pub fn addNewline(p: *Pardes, t: *Text, below: bool, cnt: usize) Error!void {
// above the selection's first line, below its last (helix line_range)
const sr = selRows(t);
const at = if (below) sr.hi_row else sr.lo_row;
- const eb = editText(p, t, at, at, -1) orelse return;
+ const eb = (try editText(p, t, at, at, -1)) orelse return;
pushUndo(p, t);
const row: usize = @intCast(@max(0, at - eb.row0));
const arena = p.scratch.allocator();
- const nl = arena.alloc(u8, cnt) catch return;
+ const nl = try arena.alloc(u8, cnt);
@memset(nl, '\n');
const llen = modal.lineSlice(eb.text, row).len;
- const new = modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = if (below) llen else 0 }, nl) catch return;
+ const new = try modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = if (below) llen else 0 }, nl);
setEditText(p, t, new);
if (!below) {
// the whole selection moved down; stay on it
@@ -1706,7 +1710,7 @@ fn pairFor(ch: u21) ?struct { o: u8, c: u8 } {
};
}
-pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around: bool) void {
+pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around: bool) Error!void {
const range = t.primaryRange(text, 0);
// helix's tree-sitter objects, from the grammar's textobjects query
const object: ?modal.Normal.Object = switch (obj) {
@@ -1738,7 +1742,7 @@ pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around
},
else => {},
}
- const lines = paneCursorLines(p, t) catch return;
+ const lines = try paneCursorLines(p, t);
const cur = modal.positionAt(text, modal.selectionCursor(text, range));
const pair: ?modal.Range = switch (obj) {
'\'', '"', '`' => modal.enclosingQuote(lines, cur, @intCast(obj)),
@@ -1762,26 +1766,26 @@ pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around
/// `ms<ch>`: wrap the selection (or the cursor char) in a pair; the wrap
/// including the pair becomes the selection
-pub fn surroundAdd(p: *Pardes, t: *Text, ch: u21) void {
+pub fn surroundAdd(p: *Pardes, t: *Text, ch: u21) Error!void {
const pr = pairFor(ch) orelse return;
t.select = false;
- const eb = editTextEol(p, t, selRows(t)) orelse return;
+ const eb = (try editTextEol(p, t, selRows(t))) orelse return;
const r = t.primaryRange(eb.text, eb.row0);
const lo = @min(r.anchor, r.head);
const hi = @max(r.anchor, r.head);
pushUndo(p, t);
const open = [1]u8{pr.o};
const close = [1]u8{pr.c};
- const new = sam.apply(p.gpa, eb.text, &.{ .{ .q0 = @intCast(lo), .q1 = @intCast(lo), .text = &open }, .{ .q0 = @intCast(hi), .q1 = @intCast(hi), .text = &close } }) catch return;
+ const new = try sam.apply(p.gpa, eb.text, &.{ .{ .q0 = @intCast(lo), .q1 = @intCast(lo), .text = &open }, .{ .q0 = @intCast(hi), .q1 = @intCast(hi), .text = &close } });
setEditText(p, t, new);
// the wrapped range keeps the direction it had (helix with_direction)
t.setRange(new, eb.row0, if (r.head < r.anchor) .{ .anchor = hi + 2, .head = lo } else .{ .anchor = lo, .head = hi + 2 }, false);
}
/// `md<ch>`: delete the enclosing pair's chars; the cursor maps through
-pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) void {
+pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) Error!void {
const pr = pairFor(ch) orelse return;
- const lines = paneCursorLines(p, t) catch return;
+ const lines = try paneCursorLines(p, t);
const cur = t.toModalCursor();
const r = (if (pr.o == pr.c)
modal.enclosingQuote(lines, cur, pr.o)
@@ -1789,7 +1793,7 @@ pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) void {
modal.enclosingPair(lines, cur, pr.o, pr.c)) orelse return;
const lo: i32 = @intCast(@min(r.a.row, cur.row));
const hi: i32 = @intCast(@max(r.b.row, cur.row));
- const eb = editText(p, t, lo, hi, -1) orelse return;
+ const eb = (try editText(p, t, lo, hi, -1)) orelse return;
const text = eb.text;
const drow = -eb.row0; // surface row -> buffer row
const ra: modal.Cursor = .{ .row = @intCast(@as(i32, @intCast(r.a.row)) + drow), .col = r.a.col };
@@ -1798,10 +1802,10 @@ pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) void {
const a_off = modal.offsetAt(text, ra);
const b_off = modal.offsetAt(text, rb);
const cur_off = modal.offsetAt(text, .{ .row = @intCast(@as(i32, @intCast(cur.row)) + drow), .col = cur.col });
- const new = sam.apply(p.gpa, text, &.{
+ const new = try sam.apply(p.gpa, text, &.{
.{ .q0 = @intCast(a_off), .q1 = @intCast(modal.nextGrapheme(text, a_off)), .text = "" },
.{ .q0 = @intCast(b_off), .q1 = @intCast(modal.nextGrapheme(text, b_off)), .text = "" },
- }) catch return;
+ });
setEditText(p, t, new);
var nc = cur_off;
if (nc > b_off) nc -= 1;
@@ -1815,21 +1819,21 @@ pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) void {
}
/// `mr<from><to>`: swap the enclosing <from> pair's chars for <to>'s
-pub fn surroundReplace(p: *Pardes, t: *Text, from: u21, to: u21) void {
+pub fn surroundReplace(p: *Pardes, t: *Text, from: u21, to: u21) Error!void {
const fp = pairFor(from) orelse return;
const tp = pairFor(to) orelse return;
- const lines = paneCursorLines(p, t) catch return;
+ const lines = try paneCursorLines(p, t);
const cur = t.toModalCursor();
const r = (if (fp.o == fp.c)
modal.enclosingQuote(lines, cur, fp.o)
else
modal.enclosingPair(lines, cur, fp.o, fp.c)) orelse return;
- const eb = editText(p, t, @as(i32, @intCast(r.a.row)), @as(i32, @intCast(r.b.row)), -1) orelse return;
+ const eb = (try editText(p, t, @as(i32, @intCast(r.a.row)), @as(i32, @intCast(r.b.row)), -1)) orelse return;
const drow = -eb.row0; // surface row -> buffer row
const ar: usize = @intCast(@as(i32, @intCast(r.a.row)) + drow);
const br: usize = @intCast(@as(i32, @intCast(r.b.row)) + drow);
pushUndo(p, t);
- const out = p.gpa.dupe(u8, eb.text) catch return;
+ const out = try p.gpa.dupe(u8, eb.text);
out[modal.lineStartOffset(out, ar) + r.a.col] = tp.o;
out[modal.lineStartOffset(out, br) + r.b.col] = tp.c;
setEditText(p, t, out);
@@ -1970,28 +1974,28 @@ test "insert and normal modes edit complete Unicode graphemes" {
pane.body.mode = .insert;
pane.body.cur_col = 22; // on z, after the CJK grapheme
- insertKey(p, &pane.body, .{ .cp = Key.left });
+ try insertKey(p, &pane.body, .{ .cp = Key.left });
try std.testing.expectEqual(@as(i32, 19), pane.body.cur_col);
- insertKey(p, &pane.body, .{ .cp = Key.left });
+ try insertKey(p, &pane.body, .{ .cp = Key.left });
try std.testing.expectEqual(@as(i32, 4), pane.body.cur_col);
- insertKey(p, &pane.body, .{ .cp = Key.right });
+ try insertKey(p, &pane.body, .{ .cp = Key.right });
try std.testing.expectEqual(@as(i32, 19), pane.body.cur_col);
- insertKey(p, &pane.body, .{ .cp = Key.backspace });
+ try insertKey(p, &pane.body, .{ .cp = Key.backspace });
try std.testing.expectEqualStrings("ae\u{301}界z", pane.file.?.content);
try std.testing.expectEqual(@as(i32, 4), pane.body.cur_col);
pane.body.mode = .normal;
pane.body.cur_col = 1;
- normalDelete(p, &pane.body, false);
+ try normalDelete(p, &pane.body, false);
try std.testing.expectEqualStrings("a界z", pane.file.?.content);
try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col);
- normalReplaceChar(p, &pane.body, 'λ');
+ try normalReplaceChar(p, &pane.body, 'λ');
try std.testing.expectEqualStrings("aλz", pane.file.?.content);
panes.File.setContent(p, &pane.file.?, try gpa.dupe(u8, "界a"));
pane.body.cur_col = 3;
pane.body.vsel = .{ .active = true, .row = 0, .col = 0, .explicit = true };
- normalReplaceChar(p, &pane.body, 'λ');
+ try normalReplaceChar(p, &pane.body, 'λ');
try std.testing.expectEqualStrings("λλ", pane.file.?.content);
try std.testing.expectEqual(@as(i32, 2), pane.body.cur_col);
try std.testing.expectEqual(@as(i32, 0), pane.body.vsel.col);
@@ -1999,7 +2003,7 @@ test "insert and normal modes edit complete Unicode graphemes" {
panes.File.setContent(p, &pane.file.?, try gpa.dupe(u8, "界a"));
pane.body.cur_col = 0;
pane.body.vsel = .{ .active = true, .row = 0, .col = 3, .explicit = true };
- normalReplaceChar(p, &pane.body, 'λ');
+ try normalReplaceChar(p, &pane.body, 'λ');
try std.testing.expectEqualStrings("λλ", pane.file.?.content);
try std.testing.expectEqual(@as(i32, 0), pane.body.cur_col);
try std.testing.expectEqual(@as(i32, 2), pane.body.vsel.col);
@@ -2015,7 +2019,7 @@ test "flat text replacement preserves a terminal fragment origin and direction"
pane.body.cur_row = 3;
pane.body.cur_col = 0;
pane.body.vsel = .{ .active = true, .row = 3, .col = 3, .explicit = true };
- normalReplaceChar(p, &pane.body, 'λ');
+ try normalReplaceChar(p, &pane.body, 'λ');
try std.testing.expectEqual(@as(i32, 3), pane.ovl.?.row);
try std.testing.expectEqualStrings("λλ", pane.ovl.?.text);
try std.testing.expectEqual(@as(i32, 3), pane.body.cur_row);
@@ -2259,7 +2263,7 @@ test "a paste past the limit is cut at it, and says so" {
const big = try gpa.alloc(u8, limit + 100);
defer gpa.free(big);
@memset(big, 'x');
- applyPaste(p, big);
+ try applyPaste(p, big);
try std.testing.expect(pane.file.?.content.len <= limit);
try std.testing.expect(pane.file.?.content.len > 0);
try std.testing.expect(std.mem.indexOf(u8, pane.msg[0..pane.msg_len], "paste cut") != null);
@@ -2283,9 +2287,9 @@ test "typing and backspace through the line index keep the text and the index as
pane.body.cur_col = @intCast(random.uintLessThan(usize, line.len + 1));
pane.body.cur_pinned = true;
if (random.boolean()) {
- insertKey(p, &pane.body, .{ .cp = 'x', .text = "x" });
+ try insertKey(p, &pane.body, .{ .cp = 'x', .text = "x" });
} else {
- insertKey(p, &pane.body, .{ .cp = Key.backspace });
+ try insertKey(p, &pane.body, .{ .cp = Key.backspace });
}
// the index the edits kept, against one built from the text
const kept = try gpa.dupe(usize, try panes.File.lineIndex(gpa, &pane.file.?));
@@ -2314,7 +2318,7 @@ test "J joins a line with the next, its indent dropped, a space between unless t
pane.body.cur_row = case.row;
pane.body.cur_col = 0;
if (case.rows > 0) pane.body.vsel = .{ .active = true, .row = case.row + case.rows, .col = 0, .explicit = true };
- normalJoin(p, &pane.body, false);
+ try normalJoin(p, &pane.body, false);
try std.testing.expectEqualStrings(case.want, pane.file.?.content);
}
}