From 84c8209d02f6830db861c3a8dde0c710c88075f0 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Mon, 9 Nov 2026 03:29:30 -0300 Subject: idioms: the edit surface fails by name: the undo history (Journal.mark, Text.remember and step, File's, terminal's and edit's pushUndo and undoStep) returns error{OutOfMemory} instead of dropping an undo point, setEditText, enterInsert and insertTab return edit.Error with try where they reported each failure, Registers.put and setYank return error{OutOfMemory} instead of losing a yank, and their other-file callers decide (try under edit.Error, said on the pane by Undo, Redo, Pipe, Edit, Query, keys, look, completion, Incl and Plumb, ENOMEM or null where a 9P write answers, Ask's false); ctl.get and getFile return GetError (fs.ReadError, now named at fs.zig's surface, and InvalidName) for the *anyerror out-parameter and errno, the 9P get, Get and Edit's e mapping it as before; the OOM undo test pins the error; perf.zig's try relabels its harness hash, the three baselines re-keyed to it (their numbers the base's) Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- test/panes.zig | 22 +++++++++++----------- test/perf-baseline-gui-debug.json | 2 +- test/perf-baseline-tui-debug.json | 2 +- test/perf-baseline-tui-fast.json | 2 +- test/perf.zig | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/panes.zig b/test/panes.zig index f221499b..740f4897 100644 --- a/test/panes.zig +++ b/test/panes.zig @@ -615,7 +615,7 @@ const TtySelectionTests = struct { try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode); if (bracketed) p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?2004h" } }); try std.testing.expectEqual(bracketed, panes.terminal.bracketedPaste(pane)); - p.registers.put(p.gpa, '"', "one\ntwo", 0, 1, true); // what a `y` anywhere left behind + try p.registers.put(p.gpa, '"', "one\ntwo", 0, 1, true); // what a `y` anywhere left behind var buf: [256]u8 = undefined; _ = childInput(p, &buf); @@ -1111,7 +1111,7 @@ test "terminal edits and undo survive partial history clearing and whole-screen pane.body.cur_col = 4; pane.body.cur_pinned = true; pane.body.vsel = .{ .active = true, .row = row, .col = 1 }; - panes.terminal.pushUndo(p, pane); + try panes.terminal.pushUndo(p, pane); const overlay = pane.ovl.?; pane.body.ed_redo[0] = .{ .ovl = .{ .row = overlay.row, .rows = overlay.rows, .text = try gpa.dupe(u8, overlay.text) }, @@ -1153,7 +1153,7 @@ test "terminal edits and undo survive partial history clearing and whole-screen try std.testing.expectEqualStrings("edit one\nedit two", snapshot.ovl.?.text); } try std.testing.expectEqual(@as(usize, 2), pane.terminal.?.vt.screens.active.pages.countTrackedPins()); - panes.terminal.undoStep(p, pane, true); + try panes.terminal.undoStep(p, pane, true); try std.testing.expectEqualStrings("edit one\nedit two", pane.ovl.?.text); try std.testing.expectEqual(expected, pane.ovl.?.row); } @@ -1170,7 +1170,7 @@ test "terminal lower scroll regions do not move edits above them" { pane.ovl = .{ .row = 1, .rows = 1, .text = try gpa.dupe(u8, "unsent") }; pane.body.cur_row = 1; pane.body.cur_pinned = true; - panes.terminal.pushUndo(p, pane); + try panes.terminal.pushUndo(p, pane); const total = panes.terminal.scrollbar(pane).total; var setup: [64]u8 = undefined; const bytes = try std.fmt.bufPrint(&setup, "\x1b[4;{d}r\x1b[{d};1H", .{ pane.rows, pane.rows }); @@ -1210,7 +1210,7 @@ test "terminal eviction and lower-region scrolling in one read preserve a surviv pane.ovl = .{ .row = old_row, .rows = 1, .text = try gpa.dupe(u8, "kept edit") }; pane.body.cur_row = old_row; pane.body.cur_pinned = true; - panes.terminal.pushUndo(p, pane); + try panes.terminal.pushUndo(p, pane); const old_total = pages.total_rows; var buf: [128]u8 = undefined; const bytes = try std.fmt.bufPrint(&buf, "new\r\n\x1b[4;{d}r\x1b[{d};1Hregion\r\n", .{ pane.rows, pane.rows }); @@ -1356,7 +1356,7 @@ test "file history keeps its last undo_max steps, and an undo or redo with no me const history = file.history; for (0..pardes.memory.limits.undo_max + 2) |index| { const next = try std.fmt.allocPrint(p.gpa, "{d}", .{index}); - panes.File.pushUndo(p, pane); + try panes.File.pushUndo(p, pane); panes.File.setContent(p, file, next); try std.testing.expectEqual(history, file.history); } @@ -1366,23 +1366,23 @@ test "file history keeps its last undo_max steps, and an undo or redo with no me try std.testing.expectEqualStrings("1", j.entries.items[j.steps.items[0].first].removed); // No memory for the bytes an undo keeps: nothing changes. failing.fail_index = failing.alloc_index; - panes.File.undoStep(p, pane, true); + try std.testing.expectError(error.OutOfMemory, panes.File.undoStep(p, pane, true)); try std.testing.expectEqualStrings("257", file.content); try std.testing.expectEqual(pardes.memory.limits.undo_max, j.done); failing.fail_index = std.math.maxInt(usize); - panes.File.undoStep(p, pane, true); + try panes.File.undoStep(p, pane, true); try std.testing.expectEqualStrings("256", file.content); try std.testing.expectEqual(@as(usize, 1), j.steps.items.len - j.done); failing.fail_index = failing.alloc_index; - panes.File.undoStep(p, pane, false); + try std.testing.expectError(error.OutOfMemory, panes.File.undoStep(p, pane, false)); try std.testing.expectEqualStrings("256", file.content); try std.testing.expectEqual(@as(usize, 1), j.steps.items.len - j.done); failing.fail_index = std.math.maxInt(usize); - panes.File.undoStep(p, pane, false); + try panes.File.undoStep(p, pane, false); try std.testing.expectEqualStrings("257", file.content); try std.testing.expectEqual(pardes.memory.limits.undo_max, j.done); // Back through every step kept, and no further. - for (0..pardes.memory.limits.undo_max + 1) |_| panes.File.undoStep(p, pane, true); + for (0..pardes.memory.limits.undo_max + 1) |_| try panes.File.undoStep(p, pane, true); try std.testing.expectEqualStrings("1", file.content); try std.testing.expectEqual(@as(usize, 0), j.done); } diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json index 06231463..c6d6bf09 100644 --- a/test/perf-baseline-gui-debug.json +++ b/test/perf-baseline-gui-debug.json @@ -1 +1 @@ -{"harness":"12b058422207ec01","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1711,"med_us":1784,"p90_us":1997,"max_us":2062},{"op":"render","fixture":"medium","min_us":81,"med_us":82,"p90_us":95,"max_us":95},{"op":"key-down","fixture":"medium","min_us":88,"med_us":89,"p90_us":92,"max_us":92},{"op":"key-right","fixture":"medium","min_us":88,"med_us":90,"p90_us":104,"max_us":108},{"op":"page-down","fixture":"medium","min_us":88,"med_us":91,"p90_us":101,"max_us":110},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":89,"max_us":96},{"op":"edit-char","fixture":"medium","min_us":333,"med_us":387,"p90_us":402,"max_us":410},{"op":"edit-twin","fixture":"medium","min_us":350,"med_us":403,"p90_us":436,"max_us":441},{"op":"body-2m","fixture":"medium","min_us":881,"med_us":1574,"p90_us":1791,"max_us":1816},{"op":"body-appends","fixture":"medium","min_us":1181,"med_us":1323,"p90_us":1574,"max_us":1613},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":106,"p90_us":118,"max_us":121},{"op":"image-frame","fixture":"medium","min_us":113,"med_us":116,"p90_us":118,"max_us":118}]} +{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1711,"med_us":1784,"p90_us":1997,"max_us":2062},{"op":"render","fixture":"medium","min_us":81,"med_us":82,"p90_us":95,"max_us":95},{"op":"key-down","fixture":"medium","min_us":88,"med_us":89,"p90_us":92,"max_us":92},{"op":"key-right","fixture":"medium","min_us":88,"med_us":90,"p90_us":104,"max_us":108},{"op":"page-down","fixture":"medium","min_us":88,"med_us":91,"p90_us":101,"max_us":110},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":89,"max_us":96},{"op":"edit-char","fixture":"medium","min_us":333,"med_us":387,"p90_us":402,"max_us":410},{"op":"edit-twin","fixture":"medium","min_us":350,"med_us":403,"p90_us":436,"max_us":441},{"op":"body-2m","fixture":"medium","min_us":881,"med_us":1574,"p90_us":1791,"max_us":1816},{"op":"body-appends","fixture":"medium","min_us":1181,"med_us":1323,"p90_us":1574,"max_us":1613},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":106,"p90_us":118,"max_us":121},{"op":"image-frame","fixture":"medium","min_us":113,"med_us":116,"p90_us":118,"max_us":118}]} diff --git a/test/perf-baseline-tui-debug.json b/test/perf-baseline-tui-debug.json index 1006021d..60bbde55 100644 --- a/test/perf-baseline-tui-debug.json +++ b/test/perf-baseline-tui-debug.json @@ -1 +1 @@ -{"harness":"12b058422207ec01","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1738,"med_us":2035,"p90_us":2220,"max_us":2221},{"op":"render","fixture":"medium","min_us":81,"med_us":83,"p90_us":85,"max_us":113},{"op":"key-down","fixture":"medium","min_us":89,"med_us":91,"p90_us":95,"max_us":97},{"op":"key-right","fixture":"medium","min_us":88,"med_us":89,"p90_us":90,"max_us":96},{"op":"page-down","fixture":"medium","min_us":88,"med_us":93,"p90_us":96,"max_us":118},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":88,"max_us":89},{"op":"edit-char","fixture":"medium","min_us":334,"med_us":384,"p90_us":536,"max_us":538},{"op":"edit-twin","fixture":"medium","min_us":371,"med_us":452,"p90_us":477,"max_us":480},{"op":"body-2m","fixture":"medium","min_us":839,"med_us":1372,"p90_us":1627,"max_us":1666},{"op":"body-appends","fixture":"medium","min_us":1152,"med_us":1329,"p90_us":1438,"max_us":1542},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":77,"p90_us":84,"max_us":102},{"op":"image-frame","fixture":"medium","min_us":112,"med_us":122,"p90_us":128,"max_us":136}]} +{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1738,"med_us":2035,"p90_us":2220,"max_us":2221},{"op":"render","fixture":"medium","min_us":81,"med_us":83,"p90_us":85,"max_us":113},{"op":"key-down","fixture":"medium","min_us":89,"med_us":91,"p90_us":95,"max_us":97},{"op":"key-right","fixture":"medium","min_us":88,"med_us":89,"p90_us":90,"max_us":96},{"op":"page-down","fixture":"medium","min_us":88,"med_us":93,"p90_us":96,"max_us":118},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":88,"max_us":89},{"op":"edit-char","fixture":"medium","min_us":334,"med_us":384,"p90_us":536,"max_us":538},{"op":"edit-twin","fixture":"medium","min_us":371,"med_us":452,"p90_us":477,"max_us":480},{"op":"body-2m","fixture":"medium","min_us":839,"med_us":1372,"p90_us":1627,"max_us":1666},{"op":"body-appends","fixture":"medium","min_us":1152,"med_us":1329,"p90_us":1438,"max_us":1542},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":77,"p90_us":84,"max_us":102},{"op":"image-frame","fixture":"medium","min_us":112,"med_us":122,"p90_us":128,"max_us":136}]} diff --git a/test/perf-baseline-tui-fast.json b/test/perf-baseline-tui-fast.json index bc07d36d..697cd91c 100644 --- a/test/perf-baseline-tui-fast.json +++ b/test/perf-baseline-tui-fast.json @@ -1 +1 @@ -{"harness":"12b058422207ec01","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1692,"med_us":1929,"p90_us":2047,"max_us":2100},{"op":"render","fixture":"medium","min_us":73,"med_us":75,"p90_us":79,"max_us":84},{"op":"key-down","fixture":"medium","min_us":79,"med_us":80,"p90_us":83,"max_us":83},{"op":"key-right","fixture":"medium","min_us":77,"med_us":78,"p90_us":79,"max_us":86},{"op":"page-down","fixture":"medium","min_us":78,"med_us":81,"p90_us":97,"max_us":107},{"op":"wheel","fixture":"medium","min_us":76,"med_us":80,"p90_us":82,"max_us":86},{"op":"edit-char","fixture":"medium","min_us":329,"med_us":366,"p90_us":389,"max_us":402},{"op":"edit-twin","fixture":"medium","min_us":336,"med_us":379,"p90_us":420,"max_us":429},{"op":"body-2m","fixture":"medium","min_us":841,"med_us":1404,"p90_us":1572,"max_us":1598},{"op":"body-appends","fixture":"medium","min_us":970,"med_us":1141,"p90_us":1251,"max_us":1263},{"op":"deep-sel","fixture":"medium","min_us":66,"med_us":71,"p90_us":77,"max_us":84},{"op":"image-frame","fixture":"medium","min_us":42,"med_us":46,"p90_us":55,"max_us":56}]} +{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1692,"med_us":1929,"p90_us":2047,"max_us":2100},{"op":"render","fixture":"medium","min_us":73,"med_us":75,"p90_us":79,"max_us":84},{"op":"key-down","fixture":"medium","min_us":79,"med_us":80,"p90_us":83,"max_us":83},{"op":"key-right","fixture":"medium","min_us":77,"med_us":78,"p90_us":79,"max_us":86},{"op":"page-down","fixture":"medium","min_us":78,"med_us":81,"p90_us":97,"max_us":107},{"op":"wheel","fixture":"medium","min_us":76,"med_us":80,"p90_us":82,"max_us":86},{"op":"edit-char","fixture":"medium","min_us":329,"med_us":366,"p90_us":389,"max_us":402},{"op":"edit-twin","fixture":"medium","min_us":336,"med_us":379,"p90_us":420,"max_us":429},{"op":"body-2m","fixture":"medium","min_us":841,"med_us":1404,"p90_us":1572,"max_us":1598},{"op":"body-appends","fixture":"medium","min_us":970,"med_us":1141,"p90_us":1251,"max_us":1263},{"op":"deep-sel","fixture":"medium","min_us":66,"med_us":71,"p90_us":77,"max_us":84},{"op":"image-frame","fixture":"medium","min_us":42,"med_us":46,"p90_us":55,"max_us":56}]} diff --git a/test/perf.zig b/test/perf.zig index 174c572a..205fcd24 100644 --- a/test/perf.zig +++ b/test/perf.zig @@ -880,7 +880,7 @@ fn measureUndoOutput(core: *pardes.Pardes, counter: *Allocations, arena: *std.he pane.body.cur_row = first + 1; pane.body.cur_col = 1; pane.body.vsel = .{ .active = true, .row = first, .col = 0 }; - pardes.panes.terminal.pushUndo(core, pane); + try pardes.panes.terminal.pushUndo(core, pane); core.gpa.free(pane.ovl.?.text); pane.ovl = null; if (pane.body.ed_undo_len != index + 1) return error.TerminalUndoSnapshotFailed; -- cgit v1.3