diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-17 05:53:16 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-17 12:15:01 -0300 |
| commit | 3dd2072fc525cdadf4f55a69f745c73c0b8c2b21 (patch) | |
| tree | bbde59afec92eab134c9d8db248ff9369530d952 | |
| parent | 2b04f877c29cf1e95c2fc8154de1da322c7299a3 (diff) | |
| download | pardes-3dd2072fc525cdadf4f55a69f745c73c0b8c2b21.tar.gz pardes-3dd2072fc525cdadf4f55a69f745c73c0b8c2b21.zip | |
edit: the edits of a text take the editing context (docs/next-editor.md, R2, second slice): enterInsert, exitInsert, handleInsert, insertKey, insertEdit, insertTab, pasteRegister, pasteText, normalDelete, normalYank, normalChange, deleteSelection, setEditCells, normalReplaceChar, chordReplace, replaceWithText, normalCase, normalJoin, normalRotateContents, normalAlign, normalIndent, normalToggleComment, normalAdjustNumber, addNewline, textobjectSelect and the three surrounds take `e: Editor`; insertEdit's splice end is `stop` and a comment extension `x` where they were `e`; 71 calls in 8 files hand `p.editor()`; core-test 810 of 949, shell-test 989 of 992, hxdiff 658 / parity 738 / hxgolf 124 with 0 mismatches, replicas pass
| -rw-r--r-- | src/Effect.zig | 6 | ||||
| -rw-r--r-- | src/Query.zig | 10 | ||||
| -rw-r--r-- | src/edit.zig | 454 | ||||
| -rw-r--r-- | src/keys.zig | 14 | ||||
| -rw-r--r-- | src/lsp/Ask.zig | 2 | ||||
| -rw-r--r-- | src/mouse.zig | 12 | ||||
| -rw-r--r-- | src/normal.zig | 58 | ||||
| -rw-r--r-- | src/tagline.zig | 2 |
8 files changed, 279 insertions, 279 deletions
diff --git a/src/Effect.zig b/src/Effect.zig index 08694e93..344034e2 100644 --- a/src/Effect.zig +++ b/src/Effect.zig @@ -364,7 +364,7 @@ test "Save on a scratch asks for a path in its inherited dir and makes it a file try std.testing.expectEqualStrings(" Save /tmp/pardes-save-dir/", np.promptText().?); // typing the filename and submitting converts it into an ordinary file - try edit.insertKey(p, &np.input, .{ .cp = 'n', .text = "note.txt" }); + try edit.insertKey(p.editor(), &np.input, .{ .cp = 'n', .text = "note.txt" }); exec.submitSave(p, id); // The write asked for, the pane is the file once it is done. var saved = false; @@ -390,7 +390,7 @@ test "Save on a terminal writes its plaintext scrollback and stays a terminal" { try std.testing.expect(p.executeBuiltinLine(0, "Save")); try std.testing.expect(pane.prompt == .save); - try edit.insertKey(p, &pane.input, .{ .cp = 'l', .text = "log.txt" }); + try edit.insertKey(p.editor(), &pane.input, .{ .cp = 'l', .text = "log.txt" }); exec.submitSave(p, 0); // the pane is untouched: still a terminal, no file behind it @@ -440,7 +440,7 @@ test "Save on an output buffer writes its rows out and leaves the buffer alone" try std.testing.expectEqualStrings(tagline.file_pane_tail, tagline.curTail(out)); try std.testing.expect(p.executeBuiltinLine(id, "Save")); try std.testing.expect(out.prompt == .save); - try edit.insertKey(p, &out.input, .{ .cp = 'h', .text = "help.txt" }); + try edit.insertKey(p.editor(), &out.input, .{ .cp = 'h', .text = "help.txt" }); exec.submitSave(p, id); // the buffer itself is untouched: same origin, same name, still refillable diff --git a/src/Query.zig b/src/Query.zig index 4cede3c5..0263052d 100644 --- a/src/Query.zig +++ b/src/Query.zig @@ -336,14 +336,14 @@ pub fn toLineOne(p: *Pardes, id: usize) void { if (layout.findPane(p, id)) |at| p.setActiveColumn(at.col); rp.focus = .body; const t = &rp.body; - if (t.mode == .insert) edit.exitInsert(p, t); + if (t.mode == .insert) edit.exitInsert(p.editor(), t); t.cur_row = 0; t.cur_col = @intCast(lineOne(rp.file.?.content).len); t.vsel.active = false; t.nsel = 0; t.cur_pinned = true; rp.query.?.seen_row = 0; - edit.enterInsert(p, t, .line_end, 1) catch |err| return p.reportError(id, "query", err); + edit.enterInsert(p.editor(), t, .line_end, 1) catch |err| return p.reportError(id, "query", err); showCurrent(rp); } @@ -1318,7 +1318,7 @@ pub fn fillList(p: *Pardes, owner_id: usize, source: Source, rows: []const u8) v if (layout.findPane(p, qid)) |at| p.setActiveColumn(at.col); rp.focus = .body; const t = &rp.body; - if (t.mode == .insert) edit.exitInsert(p, t); + if (t.mode == .insert) edit.exitInsert(p.editor(), t); t.vsel.active = false; t.nsel = 0; caretTo(rp, q.current orelse 0); @@ -1770,7 +1770,7 @@ pub fn land(p: *Pardes, id: usize, row: ?usize) void { const q = rp.query orelse return; if (row) |r| if (r < q.items.items.len and q.items.items[r].kind == .hit) setCurrent(p, id, r, true); const t = &rp.body; - if (t.mode == .insert) edit.exitInsert(p, t); + if (t.mode == .insert) edit.exitInsert(p.editor(), t); freeze(p, id); const owner_id = p.paneBySerial(q.owner); if (q.source == .text) { @@ -1872,7 +1872,7 @@ pub fn cancel(p: *Pardes, id: usize) void { const rp = p.panes[id] orelse return; const q = rp.query orelse return; const t = &rp.body; - if (t.mode == .insert) edit.exitInsert(p, t); + if (t.mode == .insert) edit.exitInsert(p.editor(), t); const owner_id = p.paneBySerial(q.owner); for (p.panes) |slot| if (slot) |tp| { if (tp.places.from != rp.serial and tp.serial != q.owner) continue; diff --git a/src/edit.zig b/src/edit.zig index e8b5aab2..9ae00079 100644 --- a/src/edit.zig +++ b/src/edit.zig @@ -77,18 +77,18 @@ fn selText(e: Editor, t: *Text) Error![]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) Error!void { - const name: u21 = if (p.view().register != 0) p.view().register else Registers.default; +pub fn pasteRegister(e: Editor, t: *Text, how: Paste, count: usize) Error!void { + const name: u21 = if (e.register.* != 0) e.register.* else Registers.default; if (name == '+' or name == '*') { - if (!normal.multiOnce(p.editor())) return; + if (!normal.multiOnce(e)) return; const pane = t.pane() orelse return; - return clipRequest(p, panes.paneIdOf(p, pane) orelse return, how); + return clipRequest(e.p, panes.paneIdOf(e.p, pane) orelse return, how); } - const y = registerValue(p.editor(), t, name) orelse return; + const y = registerValue(e, t, name) orelse return; switch (how) { - .after => try pasteText(p, t, y, false, count), - .before => try pasteText(p, t, y, true, count), - .replace => try replaceWithText(p, t, y), + .after => try pasteText(e, t, y, false, count), + .before => try pasteText(e, t, y, true, count), + .replace => try replaceWithText(e, t, y), } } @@ -144,16 +144,16 @@ pub fn applyPaste(p: *Pardes, whole: []const u8) Error!void { line[n] = byte; n += 1; }; - if (n > 0) try insertKey(p, &pane.input, .{ .cp = line[0], .text = line[0..n] }); + if (n > 0) try insertKey(p.editor(), &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 => try pasteText(p, &pane.body, bytes, false, 1), - .before => try pasteText(p, &pane.body, bytes, true, 1), - .replace => try replaceWithText(p, &pane.body, bytes), + .after => try pasteText(p.editor(), &pane.body, bytes, false, 1), + .before => try pasteText(p.editor(), &pane.body, bytes, true, 1), + .replace => try replaceWithText(p.editor(), &pane.body, bytes), } } @@ -168,7 +168,7 @@ fn pasteInto(p: *Pardes, t: *Text, bytes: []const u8) Error!void { const kept_n = t.nsel; @memcpy(kept_sels[0..kept_n], t.sels[0..kept_n]); t.refused = false; - if (t.mode == .insert) try insertKey(p, t, typed) else try pasteText(p, t, bytes, false, 1); + if (t.mode == .insert) try insertKey(p.editor(), t, typed) else try pasteText(p.editor(), t, bytes, false, 1); if (t.refused) { t.cur_row, t.cur_col, t.vsel = kept; t.restoreSels(kept_sels[0..kept_n]); @@ -191,7 +191,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) catch |err| p.reportError(p.view().active, "edit", err); + normalYank(p.editor(), &pane.body) catch |err| p.reportError(p.view().active, "edit", err); pane.body.nsel = others; } } @@ -354,7 +354,7 @@ pub fn currentSelText(p: *Pardes, pane: *Pane) ?[]const u8 { return vselText(p.editor(), &pane.body) catch null; } -pub fn exitInsert(p: *Pardes, t: *Text) void { +pub fn exitInsert(e: Editor, t: *Text) void { t.mode = .normal; t.reg_wait = false; t.normal.clear(); @@ -363,7 +363,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.editor(), t) catch |err| return p.reportError(p.view().active, "edit", err); + const text = flatSurface(e, t) catch |err| return e.reportError(err); var rs: [Text.max_selections]modal.Selection = undefined; const got = t.ranges(text, 0, &rs); for (rs[0..got.n]) |*r| { @@ -783,17 +783,17 @@ pub fn clampFileCursor(t: *Text) bool { return old_row != t.cur_row or old_col != t.cur_col; } -pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) Error!void { +pub fn enterInsert(e: Editor, t: *Text, where: InsertAt, cnt: usize) Error!void { if (t.what == .body) if (t.pane()) |pane| if (pane.addon != null) return; - pinPaneCursor(p.editor(), t); + pinPaneCursor(e, t); _ = clampFileCursor(t); // snapshot once per insert session (WITH the pre-insert selection) so // `u` undoes the whole session and restores what was selected - try pushUndo(p.editor(), t); + try pushUndo(e, t); t.select = false; t.restore_cursor = false; t.sticky_col = -1; - const text = flatSurface(p.editor(), t) catch { + const text = flatSurface(e, t) catch { t.mode = .insert; t.vsel.active = false; t.normal.clear(); @@ -825,8 +825,8 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) Error!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 = try std.mem.concat(p.gpa, u8, &.{ text, "\n" }); - try setEditText(p.editor(), t, grown); + const grown = try std.mem.concat(e.gpa, u8, &.{ text, "\n" }); + try setEditText(e, t, grown); now = grown; // what setEditText keeps; `text` may be gone } const gc = modal.positionAt(now, gap); @@ -850,14 +850,14 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) Error!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 = (try editText(p.editor(), t, abs, abs, -1)) orelse return; + const eb = (try editText(e, t, abs, abs, -1)) orelse return; const row: usize = @intCast(@max(0, abs - eb.row0)); // helix open_below/open_above: the tree's indent for a line // after the one above the new one, else acme's copy of this one const above = if (below) row else row -| 1; const after = if (!below and row == 0) 0 else panes.File.textLineStart(t, eb.text, above) + panes.File.textLine(t, eb.text, above).len; - const ind = (try treeIndent(p.editor(), t, eb.text, above, after)) orelse modal.indentText(modal.lineSlice(eb.text, row)); - const arena = p.scratch.allocator(); + const ind = (try treeIndent(e, t, eb.text, above, after)) orelse modal.indentText(modal.lineSlice(eb.text, row)); + const arena = e.scratch; const block_len = std.math.mul(usize, cnt, ind.len + 1) catch return error.OutOfMemory; const block = try arena.alloc(u8, block_len); var block_at: usize = 0; @@ -877,13 +877,13 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) Error!void .{ .row = row, .col = modal.lineSlice(eb.text, row).len } else .{ .row = row, .col = 0 }; - const new = try modal.insertAt(p.gpa, eb.text, at, block); - try setEditText(p.editor(), t, new); + const new = try modal.insertAt(e.gpa, eb.text, at, block); + try setEditText(e, t, new); t.cur_row = @as(i32, @intCast(if (below) row + 1 else row)) + eb.row0; t.cur_col = @intCast(ind.len); t.cur_pinned = true; - if (cnt > 1 and p.multi_count == 1) opened: { - const t2 = flatSurface(p.editor(), t) catch break :opened; + if (cnt > 1 and e.multi_count.* == 1) opened: { + const t2 = flatSurface(e, t) catch break :opened; var rs: [Text.max_selections]modal.Selection = undefined; const m = @min(cnt, Text.max_selections); for (0..m) |k| { @@ -899,23 +899,23 @@ pub fn enterInsert(p: *Pardes, t: *Text, where: InsertAt, cnt: usize) Error!void t.show(); } -pub fn handleInsert(p: *Pardes, t: *Text, key: Key) void { - 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 handleInsert(e: Editor, t: *Text, key: Key) void { + if (t.nsel == 0) return insertKey(e, t, key) catch |err| e.reportError(err); + normal.replaySels(e.p, t, .{ .insert = key }); } -pub fn insertKey(p: *Pardes, t: *Text, key: Key) Error!void { +pub fn insertKey(e: Editor, 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 }); - if (hit(key, config.insert_delete_alias)) return insertKey(p, t, .{ .cp = Key.delete }); + if (hit(key, config.insert_backspace_alias)) return insertKey(e, t, .{ .cp = Key.backspace }); + if (hit(key, config.insert_enter_alias)) return insertKey(e, t, .{ .cp = Key.enter }); + if (hit(key, config.insert_delete_alias)) return insertKey(e, t, .{ .cp = Key.delete }); // Ctrl-r <reg>: type this range's value of the register (helix // insert_register) if (t.reg_wait) { t.reg_wait = false; if (key.ctrl or key.alt or key.cp >= 0xF0000) return; - const y = registerValue(p.editor(), t, key.cp) orelse return; - if (y.len > 0) try insertKey(p, t, .{ .cp = key.cp, .text = y }); + const y = registerValue(e, t, key.cp) orelse return; + if (y.len > 0) try insertKey(e, t, .{ .cp = key.cp, .text = y }); return; } if (hit(key, config.insert_register)) { @@ -923,20 +923,20 @@ pub fn insertKey(p: *Pardes, t: *Text, key: Key) Error!void { return; } // helix commit_undo_checkpoint: `u` after the session goes back to here - if (hit(key, config.insert_checkpoint)) return pushUndo(p.editor(), t); + if (hit(key, config.insert_checkpoint)) return pushUndo(e, t); // helix maps every range through each insert-mode edit (Range::map): // the edits below work on the bare cursor, and the range the cursor // heads is carried through what they did to the text afterwards - if (!t.vsel.active) return insertEdit(p, t, key); - const old = flatSurface(p.editor(), t) catch return insertEdit(p, t, key); + if (!t.vsel.active) return insertEdit(e, t, key); + const old = flatSurface(e, t) catch return insertEdit(e, t, key); const r = t.primaryRange(old, 0); const c = modal.selectionCursor(old, r); const old_len = old.len; const explicit = t.vsel.explicit; t.vsel.active = false; - try insertEdit(p, t, key); + try insertEdit(e, t, key); if (t.mode != .insert) return; - const new = try flatSurface(p.editor(), t); + const new = try flatSurface(e, 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) @@ -989,13 +989,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) Error!void { +fn insertEdit(e: Editor, t: *Text, key: Key) Error!void { t.vsel.active = false; - if (!t.cur_pinned) pinPaneCursor(p.editor(), t); + if (!t.cur_pinned) pinPaneCursor(e, t); _ = clampFileCursor(t); switch (key.cp) { Key.left, Key.right, Key.up, Key.down => { - const lines = try paneCursorLines(p.editor(), t); + const lines = try paneCursorLines(e, 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 @@ -1024,7 +1024,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { Key.page_up, Key.page_down => { // helix binds insert pageup/pagedown to the same view // scroll + cursor snap as normal mode - const flat = try flatSurface(p.editor(), t); + const flat = try flatSurface(e, t); const range = t.primaryRange(flat, 0); if (t.what != .body) return; const step: i32 = @intCast(@max(1, (t.pane() orelse return).rows)); @@ -1039,7 +1039,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { }, Key.end => { // helix insert End: past the last char (goto_line_end_newline) - const text = try flatSurface(p.editor(), t); + const text = try flatSurface(e, t); const cur0 = t.toModalCursor(); t.cur_col = @intCast(panes.File.textLine(t, text, cur0.row).len); t.cur_pinned = true; @@ -1048,7 +1048,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { }, else => {}, } - const eb = (try editText(p.editor(), t, t.cur_row, t.cur_row, t.cur_col)) orelse return; + const eb = (try editText(e, 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) { @@ -1061,11 +1061,11 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { modal.insertOffset(text, c); const end = modal.advanceBy(c, key.text); if (bodyFile(t)) |f| { - if (!panes.File.replace(p, f, at, 0, key.text)) return; + if (!panes.File.replace(e.p, f, at, 0, key.text)) return; t.last_edit = .{ .row = @intCast(end.row), .col = @intCast(end.col) }; } else { - const new = try modal.spliceAlloc(p.gpa, text, at, at, key.text); - try setEditTextSpan(p.editor(), t, new, end, .{ .head = at, .tail = text.len - at }); + const new = try modal.spliceAlloc(e.gpa, text, at, at, key.text); + try setEditTextSpan(e, t, new, end, .{ .head = at, .tail = text.len - at }); } t.cur_row = @as(i32, @intCast(end.row)) + eb.row0; t.cur_col = @intCast(end.col); @@ -1076,7 +1076,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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) - ((try editText(p.editor(), t, t.cur_row - 1, t.cur_row, 0)) orelse return) + ((try editText(e, 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 }; @@ -1085,8 +1085,8 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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 = try modal.deleteSpan(p.gpa, e2.text, fc, c2); - try setEditTextEnd(p.editor(), t, new, fc); + const new = try modal.deleteSpan(e.gpa, e2.text, fc, c2); + try setEditTextEnd(e, t, new, fc); t.cur_row = @as(i32, @intCast(fc.row)) + e2.row0; t.cur_col = @intCast(fc.col); t.cur_pinned = true; @@ -1095,7 +1095,7 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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)) - ((try editText(p.editor(), t, t.cur_row, t.cur_row + 1, t.cur_col)) orelse return) + ((try editText(e, 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 }; @@ -1103,14 +1103,14 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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 = try modal.deleteSpan(p.gpa, e2.text, c2, modal.positionAt(e2.text, to)); - try setEditTextEnd(p.editor(), t, new, c2); + const new = try modal.deleteSpan(e.gpa, e2.text, c2, modal.positionAt(e2.text, to)); + try setEditTextEnd(e, t, new, c2); t.cur_pinned = true; return; } if (hit(key, config.kill_to_line_start)) { - const new = try modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = 0 }, c); - try setEditTextEnd(p.editor(), t, new, .{ .row = c.row, .col = 0 }); + const new = try modal.deleteSpan(e.gpa, text, .{ .row = c.row, .col = 0 }, c); + try setEditTextEnd(e, t, new, .{ .row = c.row, .col = 0 }); t.cur_col = 0; t.cur_pinned = true; t.show(); @@ -1118,8 +1118,8 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { } if (hit(key, config.kill_to_line_end)) { const llen = modal.lineSlice(text, c.row).len; - const new = try modal.deleteSpan(p.gpa, text, c, .{ .row = c.row, .col = llen }); - try setEditTextEnd(p.editor(), t, new, c); + const new = try modal.deleteSpan(e.gpa, text, c, .{ .row = c.row, .col = llen }); + try setEditTextEnd(e, t, new, c); t.cur_pinned = true; return; } @@ -1131,8 +1131,8 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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 = try modal.insertAt(p.gpa, text, .{ .row = c.row, .col = 0 }, "\n"); - try setEditTextEnd(p.editor(), t, new, .{ .row = c.row + 1, .col = 0 }); + const new = try modal.insertAt(e.gpa, text, .{ .row = c.row, .col = 0 }, "\n"); + try setEditTextEnd(e, t, new, .{ .row = c.row + 1, .col = 0 }); t.cur_row += 1; t.cur_pinned = true; t.show(); @@ -1144,9 +1144,9 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { // delimiter. Between a pair (helix insert_newline's // on_auto_pair) the closer goes to a line of its own at that // indent, the cursor to one a level in. - const arena = p.scratch.allocator(); + const arena = e.scratch; const lead = modal.indentText(line); - const tree = try treeIndent(p.editor(), t, text, c.row, panes.File.textLineStart(t, text, c.row) + before.len); + const tree = try treeIndent(e, t, text, c.row, panes.File.textLineStart(t, text, c.row) + before.len); const pair = bodyFile(t) != null and c.col < line.len and opensPair(before[before.len - 1], line[c.col]); const more = modal.newlineIndentWidth(line, c.col) > lead.len; const base = tree orelse if (pair or !more) lead else try std.mem.concat(arena, u8, &.{ lead, indents.unit(null, lead) }); @@ -1155,10 +1155,10 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { // 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 = try modal.deleteSpan(p.gpa, text, .{ .row = c.row, .col = kept }, c); - defer p.gpa.free(cut); - const new = try modal.insertAt(p.gpa, cut, .{ .row = c.row, .col = kept }, block); - try setEditTextEnd(p.editor(), t, new, if (pair) .{ .row = c.row + 2, .col = base.len } else .{ .row = c.row + 1, .col = mid.len }); + const cut = try modal.deleteSpan(e.gpa, text, .{ .row = c.row, .col = kept }, c); + defer e.gpa.free(cut); + const new = try modal.insertAt(e.gpa, cut, .{ .row = c.row, .col = kept }, block); + try setEditTextEnd(e, t, new, if (pair) .{ .row = c.row + 2, .col = base.len } else .{ .row = c.row + 1, .col = mid.len }); t.cur_row += 1; t.cur_col = @intCast(mid.len); t.cur_pinned = true; @@ -1182,16 +1182,16 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { } // deleteSpan's splice, the line found once. const s = start + @min(prev, line.len); - const e = start + @min(c.col, line.len); + const stop = start + @min(c.col, line.len); if (bodyFile(t)) |f| { // As the whole text put back would be: a no-op edit // when there is nothing before the cursor to take. - if (!(if (e > s) panes.File.replace(p, f, s, e - s, "") else panes.File.replace(p, f, text.len, 0, ""))) return; + if (!(if (stop > s) panes.File.replace(e.p, f, s, stop - s, "") else panes.File.replace(e.p, f, text.len, 0, ""))) return; t.last_edit = .{ .row = @intCast(c.row), .col = @intCast(prev) }; } else { - 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 }; - try setEditTextSpan(p.editor(), t, new, .{ .row = c.row, .col = prev }, span); + const new = if (stop > s) try modal.spliceAlloc(e.gpa, text, s, stop, "") else try e.gpa.dupe(u8, text); + const span: panes.File.Span = if (stop > s) .{ .head = s, .tail = text.len - stop } else .{ .head = text.len, .tail = 0 }; + try setEditTextSpan(e, t, new, .{ .row = c.row, .col = prev }, span); } t.cur_col = @intCast(prev); t.cur_pinned = true; @@ -1201,12 +1201,12 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!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 = (try editText(p.editor(), t, t.cur_row - 1, t.cur_row, 0)) orelse return; + const e2 = (try editText(e, 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 = try modal.deleteSpan(p.gpa, e2.text, .{ .row = row - 1, .col = prevlen }, .{ .row = row, .col = 0 }); - try setEditTextEnd(p.editor(), t, new, .{ .row = row - 1, .col = prevlen }); + const new = try modal.deleteSpan(e.gpa, e2.text, .{ .row = row - 1, .col = prevlen }, .{ .row = row, .col = 0 }); + try setEditTextEnd(e, t, new, .{ .row = row - 1, .col = prevlen }); t.cur_row -= 1; t.cur_col = @intCast(prevlen); t.cur_pinned = true; @@ -1218,26 +1218,26 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { const line = modal.lineSlice(text, c.row); if (c.col < line.len) { const at = modal.offsetAt(text, c); - const new = try modal.spliceAlloc(p.gpa, text, at, modal.nextGrapheme(text, at), ""); - try setEditTextEnd(p.editor(), t, new, c); + const new = try modal.spliceAlloc(e.gpa, text, at, modal.nextGrapheme(text, at), ""); + try setEditTextEnd(e, t, new, c); } else { - const e2 = (try editText(p.editor(), t, t.cur_row, t.cur_row + 1, t.cur_col)) orelse return; + const e2 = (try editText(e, 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 = try modal.deleteSpan(p.gpa, e2.text, .{ .row = row, .col = c.col }, .{ .row = row + 1, .col = 0 }); - try setEditTextEnd(p.editor(), t, new, .{ .row = row, .col = c.col }); + const new = try modal.deleteSpan(e.gpa, e2.text, .{ .row = row, .col = c.col }, .{ .row = row + 1, .col = 0 }); + try setEditTextEnd(e, t, new, .{ .row = row, .col = c.col }); } t.cur_pinned = true; }, Key.tab => { const ln = modal.lineSlice(text, c.row); - if (p.multi_count == 1 and c.col > 0 and c.col <= ln.len and ln[c.col - 1] == '.') dot: { + if (e.multi_count.* == 1 and c.col > 0 and c.col <= ln.len and ln[c.col - 1] == '.') dot: { if (t.what != .body) break :dot; const f = (t.pane() orelse break :dot).file orelse break :dot; if (f.output != null or !lsp.speaks(f.path)) break :dot; - const seq = p.lsp_ask.seq; - p.lspRequest(p.view().active, .completion, ""); - if (p.lsp_ask.seq != seq) return; + const seq = e.p.lsp_ask.seq; + e.p.lspRequest(e.p.view().active, .completion, ""); + if (e.p.lsp_ask.seq != seq) return; } // helix smart_tab: after text, Tab leaves the syntax node the // cursor is in; only where the file has a grammar, since the @@ -1248,23 +1248,23 @@ fn insertEdit(p: *Pardes, t: *Text, key: Key) Error!void { const pane = t.pane() orelse break :smart; const f = pane.file orelse break :smart; if (!syntax.supportsPath(f.path)) break :smart; - return normal.nodeSelect(p, pane, t, .parent_node_end); + return normal.nodeSelect(e.p, pane, t, .parent_node_end); } - try insertTab(p, t); + try insertTab(e, t); }, else => {}, } } -pub fn insertTab(p: *Pardes, t: *Text) Error!void { - const eb = (try editText(p.editor(), t, t.cur_row, t.cur_row, t.cur_col)) orelse return; +pub fn insertTab(e: Editor, t: *Text) Error!void { + const eb = (try editText(e, t, t.cur_row, t.cur_row, t.cur_col)) 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 = try modal.insertAt(p.gpa, eb.text, c, " "[0..pad]); - try setEditTextEnd(p.editor(), t, new, .{ .row = c.row, .col = c.col + pad }); + const new = try modal.insertAt(e.gpa, eb.text, c, " "[0..pad]); + try setEditTextEnd(e, t, new, .{ .row = c.row, .col = c.col + pad }); t.cur_col += @intCast(pad); t.cur_pinned = true; t.show(); @@ -1290,41 +1290,41 @@ fn vselText(e: Editor, t: *Text) Error![]const u8 { return e.scratch.dupe(u8, text[@min(r.anchor, r.head)..@max(r.anchor, r.head)]); } -pub fn normalDelete(p: *Pardes, t: *Text, yank: bool) Error!void { +pub fn normalDelete(e: Editor, 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) try setYank(p.editor(), try vselText(p.editor(), t)); // read the range before the move - try pushUndo(p.editor(), t); - const eb = (try editTextEol(p.editor(), t, b)) orelse { + if (yank) try setYank(e, try vselText(e, t)); // read the range before the move + try pushUndo(e, t); + const eb = (try editTextEol(e, t, b)) orelse { t.vsel.active = false; return; }; - const new = try deleteSelection(p, t, eb); - try setEditText(p.editor(), t, new); + const new = try deleteSelection(e, t, eb); + try setEditText(e, t, new); t.cur_row = b.lo_row; t.cur_col = b.lo_col; t.clampCursor(new, eb.row0); } -pub fn normalYank(p: *Pardes, t: *Text) Error!void { +pub fn normalYank(e: Editor, t: *Text) Error!void { t.select = false; if (t.what == .body) if (t.pane()) |pane| if (pane.rawPointerText(pane.sel[sel_slot])) |text| { - try setYank(p.editor(), text); + try setYank(e, text); return; }; - try setYank(p.editor(), try if (t.vsel.active) vselText(p.editor(), t) else selText(p.editor(), t)); + try setYank(e, try if (t.vsel.active) vselText(e, t) else selText(e, t)); } -pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usize) Error!void { +pub fn pasteText(e: Editor, t: *Text, y0: []const u8, before: bool, count: usize) Error!void { if (y0.len == 0) return; - try pushUndo(p.editor(), t); + try pushUndo(e, t); t.select = false; t.sticky_col = -1; - const arena = p.scratch.allocator(); + const arena = e.scratch; var y: []const u8 = y0; if (count > 1) { const total = std.math.mul(usize, count, y0.len) catch return error.OutOfMemory; @@ -1336,7 +1336,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 = (try editText(p.editor(), t, b.lo_row, b.hi_row, -1)) orelse return; + const eb = (try editText(e, 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]; @@ -1345,14 +1345,14 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz if (before) { const row: usize = @intCast(@max(0, b.lo_row - row0)); const block = try std.fmt.allocPrint(arena, "{s}\n", .{block_text}); - out = try modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = 0 }, block); + out = try modal.insertAt(e.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 = try modal.pasteLineBelow(p.gpa, eb.text, row, block_text); + out = try modal.pasteLineBelow(e.gpa, eb.text, row, block_text); t.cur_row = @as(i32, @intCast(row + n)) + row0; } - try setEditText(p.editor(), t, out); + try setEditText(e, t, out); t.vsel = .{ .active = true, .row = t.cur_row - @as(i32, @intCast(n - 1)), .col = 0, .explicit = false }; // cursor ON the last pasted line's '\n' (helix) const llen = modal.lineSlice(out, @intCast(@max(0, t.cur_row - row0))).len; @@ -1368,8 +1368,8 @@ 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 = try modal.insertAt(p.gpa, eb.text, at, y); - try setEditText(p.editor(), t, out); + const out = try modal.insertAt(e.gpa, eb.text, at, y); + try setEditText(e, 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); if (end.col > 0) { @@ -1384,25 +1384,25 @@ pub fn pasteText(p: *Pardes, t: *Text, y0: []const u8, before: bool, count: usiz t.show(); } -pub fn normalChange(p: *Pardes, t: *Text) Error!void { +pub fn normalChange(e: Editor, t: *Text) Error!void { t.select = false; t.sticky_col = -1; if (t.vsel.active) { const b = vselBounds(t); - const eb = (try editTextEol(p.editor(), t, b)) orelse return; + const eb = (try editTextEol(e, 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) { - try setYank(p.editor(), try vselText(p.editor(), t)); - try pushUndo(p.editor(), t); - 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))); - try setEditText(p.editor(), t, d); + try setYank(e, try vselText(e, t)); + try pushUndo(e, t); + const d = try modal.deleteLines(e.gpa, eb.text, @intCast(@max(0, b.lo_row - eb.row0)), @intCast(@max(0, b.hi_row - eb.row0))); + try setEditText(e, 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 arena = e.scratch; const block = try std.fmt.allocPrint(arena, "{s}\n", .{ind}); - const new = try modal.insertAt(p.gpa, d, .{ .row = row, .col = 0 }, block); - try setEditText(p.editor(), t, new); + const new = try modal.insertAt(e.gpa, d, .{ .row = row, .col = 0 }, block); + try setEditText(e, t, new); t.cur_row = @as(i32, @intCast(row)) + eb.row0; t.cur_col = @intCast(ind.len); t.vsel.active = false; @@ -1412,10 +1412,10 @@ pub fn normalChange(p: *Pardes, t: *Text) Error!void { t.show(); return; } - try setYank(p.editor(), try vselText(p.editor(), t)); - try pushUndo(p.editor(), t); - const new = try deleteSelection(p, t, eb); - try setEditText(p.editor(), t, new); + try setYank(e, try vselText(e, t)); + try pushUndo(e, t); + const new = try deleteSelection(e, t, eb); + try setEditText(e, t, new); t.cur_row = b.lo_row; t.cur_col = b.lo_col; t.clampCursor(new, eb.row0); @@ -1423,12 +1423,12 @@ pub fn normalChange(p: *Pardes, t: *Text) Error!void { t.normal.clear(); return; } - try pushUndo(p.editor(), t); - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; + try pushUndo(e, t); + const eb = (try editTextEol(e, t, selRows(t))) orelse return; const r = t.primaryRange(eb.text, eb.row0); - try setYank(p.editor(), eb.text[r.anchor..r.head]); - const new = try modal.spliceAlloc(p.gpa, eb.text, r.anchor, r.head, ""); - try setEditText(p.editor(), t, new); + try setYank(e, eb.text[r.anchor..r.head]); + const new = try modal.spliceAlloc(e.gpa, eb.text, r.anchor, r.head, ""); + try setEditText(e, 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))); t.mode = .insert; @@ -1436,9 +1436,9 @@ pub fn normalChange(p: *Pardes, t: *Text) Error!void { } /// `eb` without the primary range. -fn deleteSelection(p: *Pardes, t: *Text, eb: panes.EditText) Error![]u8 { +fn deleteSelection(e: Editor, t: *Text, eb: panes.EditText) Error![]u8 { const r = t.primaryRange(eb.text, eb.row0); - return modal.spliceAlloc(p.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), ""); + return modal.spliceAlloc(e.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), ""); } /// the rows an op's selection spans, absolute (what editText must cover) @@ -1460,15 +1460,15 @@ 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) Error!void { +fn setEditCells(e: Editor, 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); const ac = modal.positionAt(new, c.anc); s.* = .{ .row = @as(i32, @intCast(cc.row)) + row0, .col = @intCast(cc.col), .arow = @as(i32, @intCast(ac.row)) + row0, .acol = @intCast(ac.col) }; } - try setEditText(p.editor(), t, new); - const text = try flatSurface(p.editor(), t); + try setEditText(e, t, new); + const text = try flatSurface(e, 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); @@ -1476,9 +1476,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) Error!void { +pub fn normalReplaceChar(e: Editor, t: *Text, ch: u21) Error!void { t.select = false; - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; + const eb = (try editTextEol(e, 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); @@ -1487,11 +1487,11 @@ pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) Error!void { 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; // a surrogate half types nothing - const rep = try p.scratch.allocator().alloc(u8, graphemes * encoded_len); + const rep = try e.scratch.alloc(u8, graphemes * encoded_len); for (0..graphemes) |i| @memcpy(rep[i * encoded_len ..][0..encoded_len], encoded[0..encoded_len]); - try pushUndo(p.editor(), t); - const new = try modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep); - try setEditText(p.editor(), t, new); + try pushUndo(e, t); + const new = try modal.spliceAlloc(e.gpa, eb.text, lo, hi, rep); + try setEditText(e, t, new); const end = lo + rep.len; const mapped: modal.Selection = if (before.head < before.anchor) .{ .anchor = end, .head = lo } @@ -1503,35 +1503,35 @@ pub fn normalReplaceChar(p: *Pardes, t: *Text, ch: u21) Error!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) Error!void { - return replaceWithText(p, t, p.registers.text(p.gpa, Registers.default) orelse return); +pub fn chordReplace(e: Editor, t: *Text) Error!void { + return replaceWithText(e, t, e.registers.text(e.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) Error!void { +fn replaceWithText(e: Editor, t: *Text, y: []const u8) Error!void { if (y.len == 0) return; t.select = false; - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; + const eb = (try editTextEol(e, t, selRows(t))) orelse return; const r = t.primaryRange(eb.text, eb.row0); const lo = @min(r.anchor, r.head); - try pushUndo(p.editor(), t); - const new = try modal.spliceAlloc(p.gpa, eb.text, lo, @max(r.anchor, r.head), y); - try setEditText(p.editor(), t, new); + try pushUndo(e, t); + const new = try modal.spliceAlloc(e.gpa, eb.text, lo, @max(r.anchor, r.head), y); + try setEditText(e, 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); } /// `~` / `` ` `` / ``Alt-` ``: case-map the selection (or the cursor char), /// keeping the selection (helix) -pub fn normalCase(p: *Pardes, t: *Text, op: modal.CaseOp) Error!void { +pub fn normalCase(e: Editor, t: *Text, op: modal.CaseOp) Error!void { t.select = false; - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; + const eb = (try editTextEol(e, t, selRows(t))) orelse return; const r = t.primaryRange(eb.text, eb.row0); - try pushUndo(p.editor(), t); - const new = try modal.changeCase(p.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), op); - try setEditText(p.editor(), t, new); + try pushUndo(e, t); + const new = try modal.changeCase(e.gpa, eb.text, @min(r.anchor, r.head), @max(r.anchor, r.head), op); + try setEditText(e, t, new); } /// Where `pos` lands after `chs`, which are ascending and disjoint. @@ -1554,19 +1554,19 @@ 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) Error!void { +pub fn normalJoin(e: Editor, 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 = (try editText(p.editor(), t, b.lo_row, b.hi_row + 1, -1)) orelse return; + const eb = (try editText(e, 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); // Lines, their count and rows from the file's index when it has one: // counted from the top, a J in a 7 MB file was 8 ms. const nlines = panes.File.textLineCount(t, text); - const arena = p.scratch.allocator(); + const arena = e.scratch; var changes: std.ArrayList(sam.Op) = .empty; var next: usize = 0; // lines below this one are joined already for (rs[0..got.n]) |r| { @@ -1590,8 +1590,8 @@ pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) Error!void { const chs = changes.items; const chs_len = chs.len; if (chs_len == 0) return; - try pushUndo(p.editor(), t); - const new = try sam.apply(p.gpa, text, chs[0..chs_len]); + try pushUndo(e, t); + const new = try sam.apply(e.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; @@ -1616,16 +1616,16 @@ pub fn normalJoin(p: *Pardes, t: *Text, select_space: bool) Error!void { n = got.n; pri = got.pri; } - try setEditCells(p, t, new, eb.row0, cells[0..n], pri, expl); + try setEditCells(e, 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) Error!void { +pub fn normalRotateContents(e: Editor, t: *Text, forward: bool, cnt: usize) Error!void { const expl = t.vsel.active and t.vsel.explicit; - const eb = (try editTextEol(p.editor(), t, allSelRows(t))) orelse return; + const eb = (try editTextEol(e, 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); @@ -1641,8 +1641,8 @@ pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) Err .text = text[@min(src.anchor, src.head)..@max(src.anchor, src.head)], }; } - try pushUndo(p.editor(), t); - const new = try sam.apply(p.gpa, text, chs[0..n]); + try pushUndo(e, t); + const new = try sam.apply(e.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| { @@ -1651,16 +1651,16 @@ pub fn normalRotateContents(p: *Pardes, t: *Text, forward: bool, cnt: usize) Err const to = from + ch.text.len; cell.* = Text.rangeCells(new, if (r.anchor > r.head) .{ .anchor = to, .head = from } else .{ .anchor = from, .head = to }); } - try setEditCells(p, t, new, eb.row0, cells[0..n], if (forward) (got.pri + by) % n else (got.pri + n - by) % n, expl); + try setEditCells(e, 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) Error!void { +pub fn normalAlign(e: Editor, t: *Text) Error!void { const expl = t.vsel.active and t.vsel.explicit; - const eb = (try editTextEol(p.editor(), t, allSelRows(t))) orelse return; + const eb = (try editTextEol(e, 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); @@ -1688,7 +1688,7 @@ pub fn normalAlign(p: *Pardes, t: *Text) Error!void { t.select = false; // helix exit_select_mode // each column's head position, left to right for (1..n) |i| widths[i] += widths[i - 1]; - const arena = p.scratch.allocator(); + const arena = e.scratch; var chs: [Text.max_selections]sam.Op = undefined; var m: usize = 0; line = std.math.maxInt(usize); @@ -1709,24 +1709,24 @@ pub fn normalAlign(p: *Pardes, t: *Text) Error!void { m += 1; } if (m == 0) return; - try pushUndo(p.editor(), t); - const new = try sam.apply(p.gpa, text, chs[0..m]); + try pushUndo(e, t); + const new = try sam.apply(e.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) }; } - try setEditCells(p, t, new, eb.row0, cells[0..n], got.pri, expl); + try setEditCells(e, t, new, eb.row0, cells[0..n], got.pri, expl); } -pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) Error!void { +pub fn normalIndent(e: Editor, t: *Text, cnt: usize, add: bool) Error!void { t.select = false; const sr = selRows(t); - const eb = (try editText(p.editor(), t, sr.lo_row, sr.hi_row, -1)) orelse return; + const eb = (try editText(e, 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(); + const arena = e.scratch; // one run of spaces, sliced per line: `>` never inserts more than this const pad = try arena.alloc(u8, modal.INDENT_W * cnt); @memset(pad, ' '); @@ -1763,16 +1763,16 @@ pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) Error!void { } } if (chs_len == 0) return; - try pushUndo(p.editor(), t); + try pushUndo(e, t); const cur_off = modal.offsetAt(text, .{ .row = @intCast(@max(0, t.cur_row - eb.row0)), .col = @intCast(@max(0, t.cur_col)) }); const anc_off = if (t.vsel.active) modal.offsetAt(text, .{ .row = @intCast(@max(0, t.vsel.row - eb.row0)), .col = @intCast(@max(0, t.vsel.col)) }) else cur_off; - const new = try sam.apply(p.gpa, text, chs[0..chs_len]); + const new = try sam.apply(e.gpa, text, chs[0..chs_len]); const nc = mapThroughChanges(chs[0..chs_len], cur_off); const na = mapThroughChanges(chs[0..chs_len], anc_off); - try setEditText(p.editor(), t, new); + try setEditText(e, t, new); const cc = modal.positionAt(new, nc); const ac = modal.positionAt(new, na); t.cur_row = @as(i32, @intCast(cc.row)) + eb.row0; @@ -1786,19 +1786,19 @@ pub fn normalIndent(p: *Pardes, t: *Text, cnt: usize, add: bool) Error!void { t.show(); } -pub fn normalToggleComment(p: *Pardes, t: *Text) Error!void { +pub fn normalToggleComment(e: Editor, 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 = try flatSurface(p.editor(), t); + const surface = try flatSurface(e, t); const last_row = @as(i32, @intCast(panes.File.textLineCount(t, surface))) - 1; - const eb = (try editText(p.editor(), t, b.lo_row, @min(b.hi_row + 1, last_row), -1)) orelse return; + const eb = (try editText(e, 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); const nlines = modal.cursorLineCount(text); - const arena = p.scratch.allocator(); + const arena = e.scratch; // 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 = try arena.alloc(usize, nlines); @@ -1818,7 +1818,7 @@ pub fn normalToggleComment(p: *Pardes, t: *Text) Error!void { const ext = if (file) |f| std.Io.Dir.path.extension(f.path) else ""; var token: []const u8 = config.comment_token_default; lang: for (config.comment_tokens) |row| { - for (row.exts) |e| if (std.ascii.eqlIgnoreCase(ext, e)) { + for (row.exts) |x| if (std.ascii.eqlIgnoreCase(ext, x)) { token = row.token; break :lang; }; @@ -1854,46 +1854,46 @@ pub fn normalToggleComment(p: *Pardes, t: *Text) Error!void { .{ .q0 = @intCast(at), .q1 = @intCast(at), .text = ins }; chs_len += 1; } - try pushUndo(p.editor(), t); + try pushUndo(e, t); // 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 = try sam.apply(p.gpa, text, chs[0..chs_len]); + const new = try sam.apply(e.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), }); - try setEditCells(p, t, new, eb.row0, cells[0..got.n], got.pri, expl); + try setEditCells(e, t, new, eb.row0, cells[0..got.n], got.pri, expl); } -pub fn normalAdjustNumber(p: *Pardes, t: *Text, delta: i64) Error!void { - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; +pub fn normalAdjustNumber(e: Editor, t: *Text, delta: i64) Error!void { + const eb = (try editTextEol(e, 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; - try pushUndo(p.editor(), t); + const rep = (modal.incrementDecimal(e.scratch, eb.text[lo..hi], delta) catch null) orelse return; + try pushUndo(e, t); t.select = false; - const new = try modal.spliceAlloc(p.gpa, eb.text, lo, hi, rep); - try setEditText(p.editor(), t, new); + const new = try modal.spliceAlloc(e.gpa, eb.text, lo, hi, rep); + try setEditText(e, 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) Error!void { +pub fn addNewline(e: Editor, 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 = (try editText(p.editor(), t, at, at, -1)) orelse return; - try pushUndo(p.editor(), t); + const eb = (try editText(e, t, at, at, -1)) orelse return; + try pushUndo(e, t); const row: usize = @intCast(@max(0, at - eb.row0)); - const arena = p.scratch.allocator(); + const arena = e.scratch; const nl = try arena.alloc(u8, cnt); @memset(nl, '\n'); const llen = modal.lineSlice(eb.text, row).len; - const new = try modal.insertAt(p.gpa, eb.text, .{ .row = row, .col = if (below) llen else 0 }, nl); - try setEditText(p.editor(), t, new); + const new = try modal.insertAt(e.gpa, eb.text, .{ .row = row, .col = if (below) llen else 0 }, nl); + try setEditText(e, t, new); if (!below) { // the whole selection moved down; stay on it const n: i32 = @intCast(cnt); @@ -1916,7 +1916,7 @@ fn pairFor(ch: u21) ?struct { o: u8, c: u8 } { }; } -pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around: bool) Error!void { +pub fn textobjectSelect(e: Editor, 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) { @@ -1933,7 +1933,7 @@ pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around if (t.what != .body) return; const pane = t.pane() orelse return; const f = if (pane.file) |*file| file else return; - const tree = normal.fileTree(p, f) orelse return; + const tree = normal.fileTree(e.p, f) orelse return; const s = syntax.objectAt(f.path, tree, text, o, around, modal.selectionCursor(text, range)) orelse return; return t.setRange(text, 0, .{ .anchor = s.from, .head = s.to }, false); } @@ -1948,7 +1948,7 @@ pub fn textobjectSelect(p: *Pardes, t: *Text, text: []const u8, obj: u21, around }, else => {}, } - const lines = try paneCursorLines(p.editor(), t); + const lines = try paneCursorLines(e, t); const cur = modal.positionAt(text, modal.selectionCursor(text, range)); const pair: ?modal.Range = switch (obj) { '\'', '"', '`' => modal.enclosingQuote(lines, cur, @intCast(obj)), @@ -1972,26 +1972,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) Error!void { +pub fn surroundAdd(e: Editor, t: *Text, ch: u21) Error!void { const pr = pairFor(ch) orelse return; t.select = false; - const eb = (try editTextEol(p.editor(), t, selRows(t))) orelse return; + const eb = (try editTextEol(e, 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); - try pushUndo(p.editor(), t); + try pushUndo(e, t); const open = [1]u8{pr.o}; const close = [1]u8{pr.c}; - 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 } }); - try setEditText(p.editor(), t, new); + const new = try sam.apply(e.gpa, eb.text, &.{ .{ .q0 = @intCast(lo), .q1 = @intCast(lo), .text = &open }, .{ .q0 = @intCast(hi), .q1 = @intCast(hi), .text = &close } }); + try setEditText(e, 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) Error!void { +pub fn surroundDelete(e: Editor, t: *Text, ch: u21) Error!void { const pr = pairFor(ch) orelse return; - const lines = try paneCursorLines(p.editor(), t); + const lines = try paneCursorLines(e, t); const cur = t.toModalCursor(); const r = (if (pr.o == pr.c) modal.enclosingQuote(lines, cur, pr.o) @@ -1999,20 +1999,20 @@ pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) Error!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 = (try editText(p.editor(), t, lo, hi, -1)) orelse return; + const eb = (try editText(e, 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 }; const rb: modal.Cursor = .{ .row = @intCast(@as(i32, @intCast(r.b.row)) + drow), .col = r.b.col }; - try pushUndo(p.editor(), t); + try pushUndo(e, t); 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 = try sam.apply(p.gpa, text, &.{ + const new = try sam.apply(e.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 = "" }, }); - try setEditText(p.editor(), t, new); + try setEditText(e, t, new); var nc = cur_off; if (nc > b_off) nc -= 1; if (nc > a_off) nc -= 1; @@ -2025,24 +2025,24 @@ pub fn surroundDelete(p: *Pardes, t: *Text, ch: u21) Error!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) Error!void { +pub fn surroundReplace(e: Editor, t: *Text, from: u21, to: u21) Error!void { const fp = pairFor(from) orelse return; const tp = pairFor(to) orelse return; - const lines = try paneCursorLines(p.editor(), t); + const lines = try paneCursorLines(e, 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 = (try editText(p.editor(), t, @as(i32, @intCast(r.a.row)), @as(i32, @intCast(r.b.row)), -1)) orelse return; + const eb = (try editText(e, 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); - try pushUndo(p.editor(), t); - const out = try p.gpa.dupe(u8, eb.text); + try pushUndo(e, t); + const out = try e.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; - try setEditText(p.editor(), t, out); + try setEditText(e, t, out); } pub fn pushUndo(e: Editor, t: *Text) error{OutOfMemory}!void { @@ -2276,28 +2276,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 - try insertKey(p, &pane.body, .{ .cp = Key.left }); + try insertKey(p.editor(), &pane.body, .{ .cp = Key.left }); try std.testing.expectEqual(@as(i32, 19), pane.body.cur_col); - try insertKey(p, &pane.body, .{ .cp = Key.left }); + try insertKey(p.editor(), &pane.body, .{ .cp = Key.left }); try std.testing.expectEqual(@as(i32, 4), pane.body.cur_col); - try insertKey(p, &pane.body, .{ .cp = Key.right }); + try insertKey(p.editor(), &pane.body, .{ .cp = Key.right }); try std.testing.expectEqual(@as(i32, 19), pane.body.cur_col); - try insertKey(p, &pane.body, .{ .cp = Key.backspace }); + try insertKey(p.editor(), &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; - try normalDelete(p, &pane.body, false); + try normalDelete(p.editor(), &pane.body, false); try std.testing.expectEqualStrings("a界z", pane.file.?.content); try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col); - try normalReplaceChar(p, &pane.body, 'λ'); + try normalReplaceChar(p.editor(), &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 }; - try normalReplaceChar(p, &pane.body, 'λ'); + try normalReplaceChar(p.editor(), &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); @@ -2305,7 +2305,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 }; - try normalReplaceChar(p, &pane.body, 'λ'); + try normalReplaceChar(p.editor(), &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); @@ -2322,7 +2322,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 }; - try normalReplaceChar(p, &pane.body, 'λ'); + try normalReplaceChar(p.editor(), &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); @@ -2499,9 +2499,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()) { - try insertKey(p, &pane.body, .{ .cp = 'x', .text = "x" }); + try insertKey(p.editor(), &pane.body, .{ .cp = 'x', .text = "x" }); } else { - try insertKey(p, &pane.body, .{ .cp = Key.backspace }); + try insertKey(p.editor(), &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.?)); @@ -2530,7 +2530,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 }; - try normalJoin(p, &pane.body, false); + try normalJoin(p.editor(), &pane.body, false); try std.testing.expectEqualStrings(case.want, pane.file.?.content); } } diff --git a/src/keys.zig b/src/keys.zig index 8a9006dc..03a3b307 100644 --- a/src/keys.zig +++ b/src/keys.zig @@ -43,9 +43,9 @@ pub fn cycleMode(p: *Pardes, id: usize) void { pane.body.mode = .normal; pane.body.normal.clear(); }, - .normal => edit.enterInsert(p, &pane.body, .at, 1) catch |err| p.reportError(id, "edit", err), + .normal => edit.enterInsert(p.editor(), &pane.body, .at, 1) catch |err| p.reportError(id, "edit", err), .insert => { - edit.exitInsert(p, &pane.body); + edit.exitInsert(p.editor(), &pane.body); if (pane.isTerminal()) enterTty(p, id); }, } @@ -232,7 +232,7 @@ pub fn handleKey(p: *Pardes, key: Key) void { pane.focus = .body; } for ([_]*Text{ &pane.body, &pane.tag }) |t| { - if (t.mode == .insert) edit.exitInsert(p, t); + if (t.mode == .insert) edit.exitInsert(p.editor(), t); t.normal.clear(); t.select = false; } @@ -342,7 +342,7 @@ pub fn handleKey(p: *Pardes, key: Key) void { p.setMessage(p.view().active, "name drafted: Enter renames the buffer, Esc drops the draft"); return; } - edit.handleInsert(p, &pane.input, key); + edit.handleInsert(p.editor(), &pane.input, key); return; } if (header == null and pane.prompt != .none) { @@ -365,7 +365,7 @@ pub fn handleKey(p: *Pardes, key: Key) void { } return; } - edit.handleInsert(p, &pane.input, key); + edit.handleInsert(p.editor(), &pane.input, key); if (normal.selRegexArmed(pane)) |a| if (panes.promptTarget(p, pane)) |answered| normal.applySelRegex(p, pane, answered, a.pat, a.mode); return; } @@ -444,9 +444,9 @@ pub fn handleKey(p: *Pardes, key: Key) void { switch (t.mode) { .normal => normal.handleNormal(p, t, key), .insert => if (hit(key, config.escape) and !t.reg_wait) - edit.exitInsert(p, t) + edit.exitInsert(p.editor(), t) else - edit.handleInsert(p, t, key), + edit.handleInsert(p.editor(), t, key), .tty => forwardKey(p, p.view().active, key), } // `.`'s log: the keys of the normal command that entered insert diff --git a/src/lsp/Ask.zig b/src/lsp/Ask.zig index da03c021..2ee33123 100644 --- a/src/lsp/Ask.zig +++ b/src/lsp/Ask.zig @@ -308,7 +308,7 @@ pub fn lspResponse(p: *Pardes, id: u32, response: ?[]const u8) void { } if (rows.len == 0) { if (w.kind == .completion and pane.body.mode == .insert and pane.body.nsel == 0 and - pane.body.cur_row == w.row and pane.body.cur_col == w.col) edit.insertTab(p, &pane.body) catch |err| return p.reportError(w.pane, "complete", err); + pane.body.cur_row == w.row and pane.body.cur_col == w.col) edit.insertTab(p.editor(), &pane.body) catch |err| return p.reportError(w.pane, "complete", err); // Nothing found fails, but for a file with no diagnostics, // which is no failure, and a completion's Tab. const none: ?[]const u8 = switch (w.kind) { diff --git a/src/mouse.zig b/src/mouse.zig index 590f6806..4eb18141 100644 --- a/src/mouse.zig +++ b/src/mouse.zig @@ -412,10 +412,10 @@ fn chordCutPaste(p: *Pardes, cut: bool) edit.Error!void { t.nsel = 0; } if (cut) { - if (t.vsel.active) try edit.normalDelete(p, t, true); + if (t.vsel.active) try edit.normalDelete(p.editor(), t, true); } else if (t.vsel.active) { - try edit.chordReplace(p, t); - } else try edit.pasteText(p, t, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1); + try edit.chordReplace(p.editor(), t); + } else try edit.pasteText(p.editor(), t, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1); return; } if (pane.body.mode == .tty) { @@ -466,9 +466,9 @@ fn chordCutPaste(p: *Pardes, cut: bool) edit.Error!void { pane.body.nsel = 0; } if (cut) { - if (pane.body.vsel.active) try edit.normalDelete(p, &pane.body, true); + if (pane.body.vsel.active) try edit.normalDelete(p.editor(), &pane.body, true); } else if (pane.body.vsel.active) { - try edit.chordReplace(p, &pane.body); + try edit.chordReplace(p.editor(), &pane.body); } else if (pane.file) |*f| { // bare cursor: splice the register in literally (no linewise // magic) so a paste right after a cut restores the text exactly @@ -491,7 +491,7 @@ fn chordCutPaste(p: *Pardes, cut: bool) edit.Error!void { pane.body.cur_pinned = true; pane.body.sticky_col = -1; pane.ensureCursorVisible(); - } else try edit.pasteText(p, &pane.body, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1); + } else try edit.pasteText(p.editor(), &pane.body, p.registers.text(p.gpa, pardes.Registers.default) orelse return, true, 1); } pub fn handleMouse(p: *Pardes, event: Mouse) void { diff --git a/src/normal.zig b/src/normal.zig index a344269c..29addd66 100644 --- a/src/normal.zig +++ b/src/normal.zig @@ -460,7 +460,7 @@ pub fn replaySels(p: *Pardes, t: *Text, what: Replay) void { t.sticky_col = list[i].sticky; (switch (what) { .normal => |normal_action| executeNormalAction(p, t, normal_action), - .insert => |insert_key| edit.insertKey(p, t, insert_key), + .insert => |insert_key| edit.insertKey(p.editor(), t, insert_key), }) catch |err| p.reportError(p.view().active, "edit", err); if (p.multi_stop) break; if (i == pri) { @@ -956,7 +956,7 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error! pane.clearPointerSelection(sel_slot); pane.sel[sel_slot].state = .none; }; - if (raw_selection and a.role == .yank) return edit.normalYank(p, t); + if (raw_selection and a.role == .yank) return edit.normalYank(p.editor(), t); edit.pinPaneCursor(p.editor(), t); const text = try edit.flatSurface(p.editor(), t); const range = t.primaryRange(text, 0); @@ -1038,19 +1038,19 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error! t.find_ch = a.char; return findMove(t, text, range, a.char, t.find_op.?, a.count); }, - .replace_prefix => return edit.normalReplaceChar(p, t, a.char), + .replace_prefix => return edit.normalReplaceChar(p.editor(), t, a.char), // `mm` .match_prefix => { const lines = try edit.paneCursorLines(p.editor(), t); const mc = modal.matchBracket(lines, modal.positionAt(text, cur)) orelse return; return pointMove(t, text, range, modal.offsetAt(text, mc)); }, - .match_inside, .match_around => return edit.textobjectSelect(p, t, text, a.char, a.role == .match_around), - .surround_add => return edit.surroundAdd(p, t, a.char), - .surround_delete => return edit.surroundDelete(p, t, a.char), - .surround_replace => return edit.surroundReplace(p, t, a.from, a.char), + .match_inside, .match_around => return edit.textobjectSelect(p.editor(), t, text, a.char, a.role == .match_around), + .surround_add => return edit.surroundAdd(p.editor(), t, a.char), + .surround_delete => return edit.surroundDelete(p.editor(), t, a.char), + .surround_replace => return edit.surroundReplace(p.editor(), t, a.from, a.char), .goto_paragraph => return t.setRange(text, 0, modal.moveParagraph(text, range, a.count, a.forward, t.select), false), - .add_newline => return edit.addNewline(p, t, a.forward, a.count), + .add_newline => return edit.addNewline(p.editor(), t, a.forward, a.count), .goto_diagnostic, .goto_diagnostic_end => { // Once a Diagnostics query fed them, the diagnostics are this // text's places: ]d and [d step them as n and N do, ]D and [D @@ -1107,7 +1107,7 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error! .open_below => .open_below, else => .open_above, }; - return edit.enterInsert(p, t, where, a.count); + return edit.enterInsert(p.editor(), t, where, a.count); }, .select_mode => { if (t.select) { @@ -1137,24 +1137,24 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error! // the body wherever it is pressed, as acme's Look from a tag does. inline .select_regex, .split_regex, .keep_regex, .remove_regex => |role| return startSelRegex(p, pane, t, @field(modal.Normal.RegexMode, @tagName(role)[0 .. @tagName(role).len - "_regex".len])), inline .expand_node, .shrink_node, .next_sibling, .prev_sibling, .all_siblings, .all_children, .parent_node_end, .parent_node_start => |role| return nodeSelect(p, pane, t, @field(modal.Normal.NodeWalk, @tagName(role))), - .delete => return edit.normalDelete(p, t, true), - .delete_noyank => return edit.normalDelete(p, t, false), - .change => return edit.normalChange(p, t), - .yank => return edit.normalYank(p, t), - .replace_with_yank => return edit.pasteRegister(p, t, .replace, a.count), - .paste_after => return edit.pasteRegister(p, t, .after, a.count), - .paste_before => return edit.pasteRegister(p, t, .before, a.count), - .switch_case => return edit.normalCase(p, t, .toggle), - .to_lowercase => return edit.normalCase(p, t, .lower), - .to_uppercase => return edit.normalCase(p, t, .upper), - .join_lines => return edit.normalJoin(p, t, false), - .join_select_space => return edit.normalJoin(p, t, true), - .rotate_contents_fwd => return edit.normalRotateContents(p, t, true, a.count), - .rotate_contents_back => return edit.normalRotateContents(p, t, false, a.count), - .align_selections => return edit.normalAlign(p, t), - .indent => return edit.normalIndent(p, t, a.count, true), - .unindent => return edit.normalIndent(p, t, a.count, false), - .comment_toggle => return edit.normalToggleComment(p, t), + .delete => return edit.normalDelete(p.editor(), t, true), + .delete_noyank => return edit.normalDelete(p.editor(), t, false), + .change => return edit.normalChange(p.editor(), t), + .yank => return edit.normalYank(p.editor(), t), + .replace_with_yank => return edit.pasteRegister(p.editor(), t, .replace, a.count), + .paste_after => return edit.pasteRegister(p.editor(), t, .after, a.count), + .paste_before => return edit.pasteRegister(p.editor(), t, .before, a.count), + .switch_case => return edit.normalCase(p.editor(), t, .toggle), + .to_lowercase => return edit.normalCase(p.editor(), t, .lower), + .to_uppercase => return edit.normalCase(p.editor(), t, .upper), + .join_lines => return edit.normalJoin(p.editor(), t, false), + .join_select_space => return edit.normalJoin(p.editor(), t, true), + .rotate_contents_fwd => return edit.normalRotateContents(p.editor(), t, true, a.count), + .rotate_contents_back => return edit.normalRotateContents(p.editor(), t, false, a.count), + .align_selections => return edit.normalAlign(p.editor(), t), + .indent => return edit.normalIndent(p.editor(), t, a.count, true), + .unindent => return edit.normalIndent(p.editor(), t, a.count, false), + .comment_toggle => return edit.normalToggleComment(p.editor(), t), .undo => return edit.undoStep(p.editor(), t, true), .redo => return edit.undoStep(p.editor(), t, false), // Language shortcuts run the same builtins as tags and leader commands. @@ -1165,8 +1165,8 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error! .goto_type_definition => return p.lspRequest(v.active, .type_definition, ""), .goto_implementation => return p.lspRequest(v.active, .implementation, ""), .format => return p.lspRequest(v.active, .format, ""), - .increment => return edit.normalAdjustNumber(p, t, @intCast(a.count)), - .decrement => return edit.normalAdjustNumber(p, t, -@as(i64, @intCast(a.count))), + .increment => return edit.normalAdjustNumber(p.editor(), t, @intCast(a.count)), + .decrement => return edit.normalAdjustNumber(p.editor(), t, -@as(i64, @intCast(a.count))), .leader => if (p.macro.replaying == 0) { v.prefix = .leader; v.leader_n = 0; diff --git a/src/tagline.zig b/src/tagline.zig index 84cb3173..d7c657ff 100644 --- a/src/tagline.zig +++ b/src/tagline.zig @@ -365,7 +365,7 @@ pub fn typedIntoName(p: *Pardes, pane: *Pane, key: pardes.Key) bool { const inside = if (back) at > 0 and at <= f.path.len else if (forward or typed) at < f.path.len else false; if (!inside) return false; draftName(p, pane, panes.File.displayWidth(f.path[0..at])); - edit.handleInsert(p, &pane.input, key); + edit.handleInsert(p.editor(), &pane.input, key); return true; } |
