diff options
Diffstat (limited to 'src/pardes.zig')
| -rw-r--r-- | src/pardes.zig | 493 |
1 files changed, 9 insertions, 484 deletions
diff --git a/src/pardes.zig b/src/pardes.zig index b20fbb32..6c5a01af 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -1195,79 +1195,6 @@ test "first document keeps its originating shell and only opens a column when it } } -test "acme placement: under a pane's text when it has many blank rows, else halving the biggest" { - const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 60 }); - defer p.deinit(); - const top = p.active; - _ = try p.setTestFile("one\ntwo\nthree\n"); - p.sync(); - p.setActiveColumn(0); - // Most of the pane is blank: a document looked from it starts under its - // three lines (makenewwindow, util.c:482-486). - const second = p.freeSlot().?; - _ = try p.openTutorView(second); - exec.placeNew(p, top, top, second, .doc); - p.sync(); - const text_end = p.bodyTop(p.panes[top].?, p.rects[top]) + 3; - try std.testing.expectEqual(text_end, p.rects[second].y); - // Fill both with text: no blank space is big, so the biggest pane is - // halved. - const full = std.mem.asBytes(&@as([80][2]u8, @splat("x\n".*))); - for ([_]usize{ top, second }) |id| panes.File.setContent(p, &p.panes[id].?.file.?, try p.gpa.dupe(u8, full)); - p.sync(); - const big = if (p.rects[second].h >= p.rects[top].h) second else top; - const was = p.rects[big]; - const third = p.freeSlot().?; - _ = try p.openTutorView(third); - exec.placeNew(p, second, second, third, .doc); - p.sync(); - try std.testing.expectEqual(big, p.col_panes[0][layout.findPane(p, third).?.idx - 1]); - try std.testing.expectEqual(was.y + was.h / 2, p.rects[third].y); - try std.testing.expectEqual(was.y + was.h, p.rects[third].y + p.rects[third].h); -} - -test "acme placement: a pane made from the middle of a column moves only the one it splits, short ones round it kept short" { - const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 60 }); - defer p.deinit(); - const top = p.active; - _ = try p.setTestFile("one\n"); - p.sync(); - p.setActiveColumn(0); - const middle = p.freeSlot().?; - _ = try p.openTutorView(middle); - exec.placeNew(p, top, top, middle, .doc); - const bottom = p.freeSlot().?; - _ = try p.openTutorView(bottom); - exec.placeNew(p, middle, middle, bottom, .doc); - p.sync(); - // A short pane above and below, dragged under a placement's minimum, - // and the middle one full of text, so it is the one halved. - const full = std.mem.asBytes(&@as([80][2]u8, @splat("x\n".*))); - for ([_]usize{ top, middle, bottom }) |id| panes.File.setContent(p, &p.panes[id].?.file.?, try p.gpa.dupe(u8, full)); - try std.testing.expectEqualSlices(usize, &.{ top, middle, bottom }, p.col_panes[0][0..3]); - const total = p.rects[top].h + p.rects[middle].h + p.rects[bottom].h; - p.panes[top].?.vweight = 2; - p.panes[bottom].?.vweight = 2; - p.panes[middle].?.vweight = @floatFromInt(total - 4); - p.sync(); - const was_top = p.rects[top]; - const was_bottom = p.rects[bottom]; - try std.testing.expect(was_top.h < layout.minRows(p, top)); - const made = p.freeSlot().?; - _ = try p.openTutorView(made); - exec.placeNew(p, middle, middle, made, .doc); - p.sync(); - try std.testing.expectEqual(layout.findPane(p, middle).?.idx + 1, layout.findPane(p, made).?.idx); - try std.testing.expectEqual(was_top, p.rects[top]); - try std.testing.expectEqual(was_bottom, p.rects[bottom]); - // A new column narrows this one, and the short panes keep their rows. - try std.testing.expect(p.executeBuiltinLine(made, "Newcol")); - p.sync(); - try std.testing.expectEqual(@as(usize, 2), p.ncol); - try std.testing.expectEqual(was_top.h, p.rects[top].h); - try std.testing.expectEqual(was_bottom.h, p.rects[bottom].h); -} - test "an empty column shows its theme's empty_col under its tag: acme's white, else the border" { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 120, .rows = 20 }); defer p.deinit(); @@ -2918,48 +2845,6 @@ test "every line of the board's boot buffer renders whole" { // ---- the boundary types ---- -test "Unicode display cells map back to body and tag byte cursors" { - const gpa = std.testing.allocator; - const p = try Pardes.init(gpa, .{ .cols = 60, .rows = 12 }); - defer p.deinit(); - const pane = try p.setTestFile("a界e\u{301}z\n"); - const f = &pane.file.?; - p.gpa.free(f.path); - f.path = try p.gpa.dupe(u8, "界e\u{301}.txt"); - - var frame = std.heap.ArenaAllocator.init(gpa); - defer frame.deinit(); - _ = try p.render(frame.allocator()); - const rect = p.rects[0]; - const text_x = rect.x + config.GUTTER + config.PREFIX_W; - const body_y = rect.y + BOX_H; - // The second screen cell is the trailing half of the wide CJK grapheme. - // Both halves map to its one byte boundary. - p.update(.{ .mouse = .{ .button = config.select_button, .kind = .press, .col = text_x + 2, .row = body_y } }); - p.update(.{ .mouse = .{ .button = config.select_button, .kind = .release, .col = text_x + 2, .row = body_y } }); - try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col); - - // A click in the wide path glyph drafts a name with its caret at the - // grapheme start; arrow motion then advances by the full UTF-8 cluster. - tagline.draftName(p, pane, 1); - try std.testing.expectEqual(@as(i32, 0), pane.input.cur_col); - edit.insertKey(p, &pane.input, .{ .cp = Key.right }); - try std.testing.expectEqual(@as(i32, 3), pane.input.cur_col); - edit.insertKey(p, &pane.input, .{ .cp = Key.right }); - try std.testing.expectEqual(@as(i32, 6), pane.input.cur_col); - pane.closePrompt(); - - const before = try gpa.dupe(u8, tagline.curTail(pane)); - defer gpa.free(before); - tagline.enterTag(p, pane); - const insertion = pane.tag.cur_col; - edit.insertKey(p, &pane.tag, .{ .cp = 'λ', .text = "λ" }); - try std.testing.expectEqual(insertion + 2, pane.tag.cur_col); - edit.insertKey(p, &pane.tag, .{ .cp = Key.backspace }); - try std.testing.expectEqual(insertion, pane.tag.cur_col); - try std.testing.expectEqualStrings(before, tagline.curTail(pane)); -} - test "Tab N draws every pane's tab N cells wide and clicks count past it; bare Tab says the width; the ctl read and a Dump keep it" { const gpa = std.testing.allocator; const p = try Pardes.init(gpa, .{ .cols = 60, .rows = 12 }); @@ -3110,65 +2995,6 @@ test "editable workspace and column tags are typed into and persist" { try std.testing.expectEqualStrings("", tagline.columnTag(empty, 0)); } -test "column tags render edit hover and scroll from the column edge" { - const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 20, .tty_only = true }); - defer p.deinit(); - _ = try p.setTestFile("untouched\n"); - p.newColumn(0); - p.newScratchIn(0, p.activeColumn().?); - p.sync(); - p.acknowledgePanelPresentation(&.{}); - var frame = std.heap.ArenaAllocator.init(std.testing.allocator); - defer frame.deinit(); - for (0..p.ncol) |column| { - const x = p.col_x[column] + TAG_TEXT_INSET; - const width = p.col_w[column] - TAG_TEXT_INSET; - const initial = try p.render(frame.allocator()); - for ("New", 0..) |byte, offset| - try std.testing.expectEqual(byte, initial.at(x + @as(u16, @intCast(offset)), TOPBAR_H).text[0]); - p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = x, .row = TOPBAR_H } }); - const hovered = try p.render(frame.allocator()); - try std.testing.expectEqual(Color{ .rgb = p.theme().sel_bg }, hovered.at(x, TOPBAR_H).style.bg); - p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = x, .row = TOPBAR_H } }); - try std.testing.expectEqual(column, p.header_column.?); - try std.testing.expectEqual(@as(i32, 0), tagline.focusedHeader(p).?.cur_col); - const at_start = try p.render(frame.allocator()); - try std.testing.expectEqual(x, at_start.cursor.?.x); - p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = x + 3, .row = TOPBAR_H } }); - p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = x + 3, .row = TOPBAR_H } }); - const selected = try p.render(frame.allocator()); - for (0..3) |offset| - try std.testing.expectEqual(Color{ .rgb = p.theme().sel_bg }, selected.at(x + @as(u16, @intCast(offset)), TOPBAR_H).style.bg); - p.update(.{ .key = .{ .cp = Key.home } }); - // A clicked header is in normal mode: `i` types there. - p.update(.{ .key = .{ .cp = 'i', .text = "i" } }); - p.update(.{ .key = .{ .cp = 'H', .text = "Help " } }); - try std.testing.expect(std.mem.startsWith(u8, tagline.columnTag(p, column), "Help New Tty")); - const edited = try p.render(frame.allocator()); - try std.testing.expectEqual(x + 5, edited.cursor.?.x); - // Only the text viewport participates in caret reveal. - const long: [80]u8 = @splat('a'); - if (p.col_tags[column].own) |own| p.gpa.free(own); - p.col_tags[column].own = try p.gpa.dupe(u8, long[0 .. width - 1]); - p.update(.{ .key = .{ .cp = Key.end } }); - const at_end = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 0), p.header_scroll); - try std.testing.expectEqual(x + width - 1, at_end.cursor.?.x); - p.update(.{ .key = .{ .cp = 'b', .text = "b" } }); - const revealed = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 1), p.header_scroll); - try std.testing.expectEqual(x + width - 1, revealed.cursor.?.x); - p.update(.{ .key = .{ .cp = Key.home } }); - const home = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 0), p.header_scroll); - try std.testing.expectEqual(x, home.cursor.?.x); - p.update(.{ .key = .{ .cp = Key.escape } }); - p.update(.pointer_leave); - _ = frame.reset(.retain_capacity); - } - try std.testing.expectEqualStrings("untouched\n", p.panes[0].?.file.?.content); -} - test "column tag first-cell execution keeps New local to the clicked column" { const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 20, .tty_only = true }); defer p.deinit(); @@ -3238,45 +3064,6 @@ test "s in a header selects in the header's own text" { try std.testing.expectEqual(@as(u16, 0), pane.body.nsel); } -test "window keys walk from a pane up through the column and workspace tags and back" { - const p = try Pardes.init(std.testing.allocator, .{ .cols = 100, .rows = 20, .tty_only = true }); - defer p.deinit(); - _ = try p.setTestFile("body\n"); - p.newColumn(0); - p.newScratchIn(0, p.activeColumn().?); - p.sync(); - p.active = p.col_panes[0][0]; - const window = struct { - fn key(core: *Pardes, letter: u21) void { - core.update(.{ .key = .{ .cp = 'w', .ctrl = true } }); - core.update(.{ .key = .{ .cp = letter } }); - } - }; - // Up from the top pane: its column's tag, in normal mode; `:` there is - // the way back to the body. - window.key(p, 'k'); - try std.testing.expect(p.header_focus and p.header_column.? == 0); - try std.testing.expectEqual(Text.Mode.normal, p.col_tags[0].mode); - p.update(.{ .key = .{ .cp = 'w' } }); - try std.testing.expect(p.col_tags[0].cur_col > 0); - const remembered = p.col_tags[0].cur_col; - window.key(p, 'l'); - try std.testing.expect(p.header_focus and p.header_column.? == 1); - window.key(p, 'h'); - try std.testing.expectEqual(remembered, p.col_tags[0].cur_col); - window.key(p, 'k'); - try std.testing.expect(p.header_focus and p.header_column == null); - window.key(p, 'j'); - try std.testing.expect(p.header_focus and p.header_column.? == 0); - window.key(p, 'j'); - try std.testing.expect(!p.header_focus); - try std.testing.expectEqual(p.col_panes[0][0], p.active); - window.key(p, 'k'); - p.update(.{ .key = .{ .cp = ':' } }); - try std.testing.expect(!p.header_focus and p.panes[p.active].?.focus == .body); - try std.testing.expectEqualStrings("body\n", p.panes[0].?.file.?.content); -} - pub const Mouse = struct { /// The host has inverted a compact body layer. Physical col/row still /// route pane chrome; these coordinates address the pane's logical text. @@ -8514,63 +8301,6 @@ test "with ProgramEsc raw tty Escape only leaves at a shell prompt" { try std.testing.expectEqual(Text.Mode.tty, pane.body.mode); } -test "window mode moves an outline and focuses it on Enter, Esc or a label" { - const p = try Pardes.init(std.testing.allocator, .{ .cols = 120, .rows = 30 }); - defer p.deinit(); - _ = try p.setTestFile("left\n"); - _ = try p.newShell(1, ""); - try std.testing.expect(layout.splitColumn(p, 0, 1, false)); - p.newScratchBelow(1); - p.sync(); - const lower = for (p.panes, 0..) |slot, id| { - if (slot != null and id > 1) break id; - } else return error.TestExpectedScratch; - p.active = 0; - // Ctrl-w enters it; h/j/k/l move only the outline. - p.update(.{ .key = .{ .cp = 'w', .ctrl = true } }); - try std.testing.expectEqual(@as(?usize, 0), p.window_pick); - p.update(.{ .key = .{ .cp = 'l', .text = "l" } }); - try std.testing.expect(p.window_pick != null and p.window_pick.? != 0); - p.update(.{ .key = .{ .cp = 'j', .text = "j" } }); - try std.testing.expectEqual(@as(?usize, lower), p.window_pick); - try std.testing.expectEqual(@as(usize, 0), p.active); - p.update(.{ .key = .{ .cp = Key.enter } }); - try std.testing.expectEqual(lower, p.active); - try std.testing.expect(p.window_pick == null); - // SPC w enters it too, and Esc also leaves it on the outlined pane. - p.update(.{ .key = .{ .cp = ' ', .text = " " } }); - p.update(.{ .key = .{ .cp = 'w', .text = "w" } }); - p.update(.{ .key = .{ .cp = 'h', .text = "h" } }); - p.update(.{ .key = .{ .cp = Key.escape } }); - try std.testing.expectEqual(@as(usize, 0), p.active); - try std.testing.expect(p.window_pick == null); - // Other keys change nothing. - p.update(.{ .key = .{ .cp = 'w', .ctrl = true } }); - p.update(.{ .key = .{ .cp = '!', .text = "!" } }); - try std.testing.expectEqual(@as(?usize, 0), p.window_pick); - p.update(.{ .key = .{ .cp = Key.escape } }); - // `:` focuses the outlined pane's tag. - p.update(.{ .key = .{ .cp = 'w', .ctrl = true } }); - p.update(.{ .key = .{ .cp = 'l', .text = "l" } }); - p.update(.{ .key = .{ .cp = ':', .text = ":" } }); - try std.testing.expect(p.active != 0 and p.panes[p.active].?.focus == .tag); - p.update(.{ .key = .{ .cp = Key.escape } }); - // A label goes straight there: the left column's pane is "a". - try std.testing.expectEqual(@as(?u8, 'a'), layout.windowLabel(p, 0)); - try std.testing.expect(p.executeBuiltinLine(p.active, "Window")); - p.update(.{ .key = .{ .cp = 'a', .text = "a" } }); - try std.testing.expectEqual(@as(usize, 0), p.active); - // Painted: the outlined tag's band in the selection colour, each pane's - // letter in its tag's box. - try std.testing.expect(p.executeBuiltinLine(p.active, "Window")); - var arena: std.heap.ArenaAllocator = .init(std.testing.allocator); - defer arena.deinit(); - const shown = try p.render(arena.allocator()); - try std.testing.expectEqual(p.theme().sel_bg, shown.tag_layers[0].bg); - const box = shown.at(p.rects[0].x, p.tagTop(p.panes[0].?, p.rects[0])); - try std.testing.expectEqualStrings("a", box.text[0..box.len]); -} - test "the Del question shows only once its delay is up: a quick SPC d j never sees it" { if (platform == .web) return; const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 40 }); @@ -8621,61 +8351,6 @@ test "the Del question shows only once its delay is up: a quick SPC d j never se try std.testing.expect(p.panes[mid] == null); } -test "window mode d deletes the outlined pane and asks k or j, c collapses it, and the mode stays" { - if (platform == .web) return; - const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 40 }); - defer p.deinit(); - p.settings.placement = .pardes; // the neighbours below are what is under test - const top = p.active; - p.newScratchBelow(top); - const mid = p.active; - p.newScratchBelow(mid); - const low = p.active; - p.sync(); - const h = [_]u16{ p.rects[top].h, p.rects[mid].h, p.rects[low].h }; - // Neither key is a pane's label. - try std.testing.expect(std.mem.indexOfAny(u8, layout.window_labels, "hjkldc") == null); - - // Ctrl-w from the bottom pane, the outline up to the middle one. - p.update(.{ .key = .{ .cp = 'w', .ctrl = true } }); - p.update(.{ .key = .{ .cp = 'k', .text = "k" } }); - try std.testing.expectEqual(@as(?usize, mid), p.window_pick); - // c folds the outlined pane to its tag and back, the mode staying. - p.update(.{ .key = .{ .cp = 'c', .text = "c" } }); - try std.testing.expect(p.panes[mid].?.collapsed); - try std.testing.expectEqual(@as(?usize, mid), p.window_pick); - p.update(.{ .key = .{ .cp = 'c', .text = "c" } }); - try std.testing.expect(!p.panes[mid].?.collapsed); - p.sync(); - try std.testing.expectEqual(h[1], p.rects[mid].h); - - // d with panes above and below asks, as SPC d does; Esc takes it back - // and the outline stays where it was. - p.update(.{ .key = .{ .cp = 'd', .text = "d" } }); - try std.testing.expectEqual(Pane.Prompt.del_side, p.panes[mid].?.prompt); - p.update(.{ .key = .{ .cp = Key.escape } }); - try std.testing.expect(p.panes[mid] != null and p.panes[mid].?.prompt == .none); - try std.testing.expectEqual(@as(?usize, mid), p.window_pick); - // j: the pane below takes the rows, and the outline goes with them. - p.update(.{ .key = .{ .cp = 'd', .text = "d" } }); - p.update(.{ .key = .{ .cp = 'j', .text = "j" } }); - p.sync(); - try std.testing.expect(p.panes[mid] == null); - try std.testing.expectEqual(h[0], p.rects[top].h); - try std.testing.expectEqual(h[1] + h[2], p.rects[low].h); - try std.testing.expectEqual(@as(?usize, low), p.window_pick); - // With one neighbour there is nothing to ask: d closes it at once, - // the outline on the pane that grew. - p.update(.{ .key = .{ .cp = 'd', .text = "d" } }); - p.sync(); - try std.testing.expect(p.panes[low] == null); - try std.testing.expectEqual(@as(?usize, top), p.window_pick); - // Enter leaves the mode on it. - p.update(.{ .key = .{ .cp = Key.enter } }); - try std.testing.expect(p.window_pick == null); - try std.testing.expectEqual(top, p.active); -} - test "raw tty Ctrl-B switches to editor mode without sending child input" { if (platform == .web) return; const p = try Pardes.init(std.testing.allocator, .{ .file = "mise.toml" }); @@ -8773,56 +8448,6 @@ test "a Rename the language server finds nothing for says so, and changes nothin try std.testing.expectEqualStrings("const value=1;\n", pane.file.?.content); } -test "hopping between two panes does not grow the jump stack" { - if (platform == .web) return; - const gpa = std.testing.allocator; - const p = try Pardes.init(gpa, .{ .cols = 80, .rows = 24, .file = "mise.toml" }); - p.settings.placement = .pardes; // two panes of room, not acme's fit to the doc's two lines - defer p.deinit(); - p.update(.{ .resize = .{ .cols = 80, .rows = 24 } }); - p.update(.{ .key = .{ .cp = 'n', .alt = true } }); // a shell under the doc - const doc = 0; - const shell = p.active; - try std.testing.expect(shell != doc); - const depth = p.njumps; - - // Esc is Last — the everyday two-pane hop. Each press used to - // append, so sixty-four of them left the stack remembering nothing else. - for (0..8) |_| { - const was = p.active; - p.update(.{ .key = .{ .cp = Key.escape } }); - try std.testing.expect(p.active != was); - } - try std.testing.expectEqual(depth, p.njumps); - - // ...and so are the other two ways to switch panes. - for (0..8) |_| { - const want = if (p.active == doc) shell else doc; - const dir: u21 = if (p.active == doc) 'j' else 'k'; - p.update(.{ .key = .{ .cp = ' ' } }); - p.update(.{ .key = .{ .cp = 'w' } }); - p.update(.{ .key = .{ .cp = dir } }); - p.update(.{ .key = .{ .cp = Key.enter } }); - try std.testing.expectEqual(want, p.active); - } - try std.testing.expectEqual(depth, p.njumps); - - for (0..8) |_| { - const other = if (p.active == doc) shell else doc; - const r = p.rects[other]; - p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = r.x + config.GUTTER + 1, .row = r.y + BOX_H + 1 } }); - p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = r.x + config.GUTTER + 1, .row = r.y + BOX_H + 1 } }); - try std.testing.expectEqual(other, p.active); - } - try std.testing.expectEqual(depth, p.njumps); - - const before = p.active; - exec.runBuiltin(p, .Back, p.active, "", null); - p.sync(); - try std.testing.expect(p.active != before); - try std.testing.expectEqual(depth, p.njumps); -} - /// Every `.write` a keystroke produced, joined — what the pane's program would /// actually have read off its pty. fn drainWrites(p: *Pardes, buf: []u8) []const u8 { @@ -9186,48 +8811,15 @@ test "board heap: every allocation failure during boot is a clean OutOfMemory" { ); } -test "a sweep pressed on the line numbers copies only the text" { - const p = try Pardes.init(std.testing.allocator, .{ .cols = 60, .rows = 12 }); - defer p.deinit(); - const pane = try p.setTestFile("alpha beta\ngamma delta\n"); - const numbers: i32 = panes.File.gutterWidth(pane); - const top: i32 = pane.tag_rows; - pane.sel[0] = .{ .state = .done, .c0 = 1, .c1 = numbers + 4, .r0 = top, .r1 = top + 1 }; - // Live, while the drag is held, and captured, once it is released. - try std.testing.expectEqualStrings("alpha beta\ngamma", try edit.selectionText(p, pane, pane.sel[0])); - try edit.capturePointerSelection(p, pane, 0); - try std.testing.expectEqualStrings("alpha beta\ngamma", try edit.selectionText(p, pane, pane.sel[0])); -} - -test "jump history clears selections and lands at the recorded cursor" { +test "jump history skips an entry whose pane slot or serial is gone, leaving the selection" { const p = try Pardes.init(std.testing.allocator, .{ .cols = 60, .rows = 12 }); defer p.deinit(); const pane = try p.setTestFile("alpha beta\ngamma delta\nepsilon zeta\n"); p.njumps = 2; p.jcur = 1; - p.jumps[0] = .{ .pane = 0, .serial = pane.serial, .line = 3, .col = 8 }; p.jumps[1] = .{ .pane = 0, .serial = pane.serial, .line = 1, .col = 1 }; - for ([_]u21{ 'o', 'i' }, 0..) |key, index| { - pane.body.setRange(pane.file.?.content, 0, .{ .anchor = 1, .head = 5 }, true); - pane.sel[0] = .{ .state = .done, .c0 = 2, .c1 = 5, .r0 = 1, .r1 = 1 }; - try edit.capturePointerSelection(p, pane, 0); - pane.body.select = true; - p.update(.{ .key = .{ .cp = key, .ctrl = true } }); - try std.testing.expectEqual(index, p.jcur); - try std.testing.expectEqual(@as(usize, 2), p.njumps); - try std.testing.expectEqual(@as(u32, 3), p.jumps[0].line); - try std.testing.expect(!pane.body.vsel.active and !pane.body.msel.active and !pane.body.select); - try std.testing.expectEqual(@as(u16, 0), pane.body.nsel); - try std.testing.expectEqual(.none, pane.sel[0].state); - try std.testing.expect(pane.pointer_selections[0] == null); - try std.testing.expectEqual(@as(i32, if (index == 0) 2 else 0), pane.body.cur_row); - try std.testing.expectEqual(@as(i32, if (index == 0) 7 else 0), pane.body.cur_col); - } pane.body.setRange(pane.file.?.content, 0, .{ .anchor = 1, .head = 5 }, true); const selected = pane.body.primaryRange(pane.file.?.content, 0); - p.jumpBy(1); // No forward entry: selection stays untouched. - try std.testing.expectEqualDeep(selected, pane.body.primaryRange(pane.file.?.content, 0)); - try std.testing.expect(std.mem.indexOf(u8, p.panes[p.active].?.msg[0..p.panes[p.active].?.msg_len], "nothing further on") != null); for ([_]Loc{ .{ .pane = 15, .serial = pane.serial, .line = 1, .col = 1 }, .{ .pane = 0, .serial = pane.serial + 1, .line = 1, .col = 1 }, @@ -9239,7 +8831,7 @@ test "jump history clears selections and lands at the recorded cursor" { } } -/// A session for the JumpScope tests: four panes of 100 lines in one +/// A session for the side-button jump test: four panes of 100 lines in one /// column, A (pane 0) and B each on a file of its own, C on A's file, and O /// an output buffer, no file behind it. `order` is the jumplist, a letter a /// place, each letter's n-th place its line 10 + 40n: "ABABA" is A10 B10 A50 @@ -9249,7 +8841,7 @@ const JumpsTest = struct { ids: [4]usize = .{ 0, 0, 0, 0 }, const letters = "ABCO"; - const Way = enum { call, key, builtin, mouse }; + const Way = enum { call, mouse }; fn init(order: []const u8) !JumpsTest { const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 80 }); @@ -9290,14 +8882,12 @@ const JumpsTest = struct { return t; } - /// One step `delta` through `way`: the function, Ctrl-o or Ctrl-i, the - /// mouse's side button pressed and let go, or the builtin's word. + /// One step `delta` through `way`: the function, or the mouse's side + /// button pressed and let go. fn step(t: JumpsTest, way: Way, delta: i32) void { const back = delta < 0; switch (way) { .call => t.p.jumpBy(delta), - .key => t.p.update(.{ .key = .{ .cp = if (back) 'o' else 'i', .ctrl = true } }), - .builtin => _ = t.p.executeBuiltinLine(t.p.active, if (back) "Back" else "Forward"), .mouse => for ([_]Mouse.Kind{ .press, .release }) |kind| t.p.update(.{ .mouse = .{ .button = if (back) .back else .forward, .kind = kind, .col = 0, .row = 0 } }), } @@ -9323,75 +8913,10 @@ const JumpsTest = struct { } }; -test "JumpScope file: Back keeps to the focused file, A50 then A10, and leaves it only once it runs out that way" { - const t = try JumpsTest.init("BABABA"); - defer t.p.deinit(); - try std.testing.expectEqual(config.Runtime.JumpScope.file, t.p.settings.jump_scope); - var buf: [128]u8 = undefined; - // B90, B50 passed over, kept in their places: A has nothing older than - // A10, so the step after it is the nearest place of any file, B10. - try std.testing.expectEqualStrings("A50 A10 B10", try t.walk(.call, -1, &buf)); - try std.testing.expectEqual(@as(usize, 6), t.p.njumps); - // Forward is the mirror, from B10 in B: B's own places first, then A90, - // the newest, where the Backs started. - try std.testing.expectEqualStrings("B50 B90 A90", try t.walk(.call, 1, &buf)); - try std.testing.expectEqual(@as(usize, 5), t.p.jcur); -} - -test "JumpScope file: Forward retraces a run of Backs inside one file step for step, back to where it began" { - const t = try JumpsTest.init("ABABA"); - defer t.p.deinit(); - var buf: [128]u8 = undefined; - // A1 B1 A2 B2 A3 from A3: nothing older than A1 at all, so Back ends there. - try std.testing.expectEqualStrings("A50 A10", try t.walk(.call, -1, &buf)); - try std.testing.expectEqual(@as(usize, 0), t.p.jcur); - try std.testing.expectEqualStrings("A50 A90", try t.walk(.call, 1, &buf)); - try std.testing.expectEqual(@as(usize, 4), t.p.jcur); - // One Back, one Forward: the same entry, whichever were passed over. - t.step(.call, -1); - try std.testing.expectEqual(@as(usize, 2), t.p.jcur); - t.step(.call, 1); - try std.testing.expectEqual(@as(usize, 4), t.p.jcur); - try std.testing.expectEqual(@as(usize, 5), t.p.njumps); -} - -test "JumpScope all: Back and Forward take every place in the order it was jumped to" { - const t = try JumpsTest.init("ABABA"); - defer t.p.deinit(); - try std.testing.expect(t.p.executeBuiltinLine(t.p.active, "JumpScope all")); - try std.testing.expectEqual(config.Runtime.JumpScope.all, t.p.settings.jump_scope); - var buf: [128]u8 = undefined; - try std.testing.expectEqualStrings("B50 A50 B10 A10", try t.walk(.call, -1, &buf)); - try std.testing.expectEqualStrings("B10 A50 B50 A90", try t.walk(.call, 1, &buf)); - // Bare, the word steps back to file. - try std.testing.expect(t.p.executeBuiltinLine(t.p.active, "JumpScope")); - try std.testing.expectEqual(config.Runtime.JumpScope.file, t.p.settings.jump_scope); -} - -test "JumpScope file: from a pane with no file, Back and Forward are global" { - const t = try JumpsTest.init("OAOBO"); - defer t.p.deinit(); - var buf: [128]u8 = undefined; - // O90 keeps to nothing: B10, the next older of all. From B, nothing of - // B is older, so O50; from O, A10; from A, O10. - try std.testing.expectEqualStrings("B10 O50 A10 O10", try t.walk(.call, -1, &buf)); - try std.testing.expectEqualStrings("A10 O50 B10 O90", try t.walk(.call, 1, &buf)); -} - -test "JumpScope file: a file in two panes keeps to the pane first, then the file in the other pane" { - // C is A's file in a second pane: C10 B10 A10 C50 A50. - const t = try JumpsTest.init("CBACA"); - defer t.p.deinit(); - var buf: [128]u8 = undefined; - // From A50: A10 in this pane, over the nearer C50; then none of A's - // own is older, so the file's in C, C10, over B10. - try std.testing.expectEqualStrings("A10 C10", try t.walk(.call, -1, &buf)); - // From C10 in C: C50, its own, then the file's newest, A50. - try std.testing.expectEqualStrings("C50 A50", try t.walk(.call, 1, &buf)); -} - -test "Back and Forward take the same steps from Ctrl-o and Ctrl-i, the mouse's side buttons, the builtins and jumpBy" { - for ([_]JumpsTest.Way{ .call, .key, .builtin, .mouse }) |way| { +// The keys and builtins are test/behaviour/modes.zig's; a mouse's side +// buttons have no /mousein bits. +test "Back and Forward take the same steps from the mouse's side buttons and jumpBy" { + for ([_]JumpsTest.Way{ .call, .mouse }) |way| { const t = try JumpsTest.init("BABABA"); defer t.p.deinit(); var buf: [128]u8 = undefined; |
