summaryrefslogtreecommitdiff
path: root/src/normal.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-17 05:49:29 -0300
committerGabriel Schneider <[email protected]>2026-11-17 12:15:01 -0300
commit2b04f877c29cf1e95c2fc8154de1da322c7299a3 (patch)
tree1430ca4deb53e0fae0b24238af543a13cf2125e1 /src/normal.zig
parent779ff8cc27014b8c2f2f078985ab2ca9cf285740 (diff)
downloadpardes-2b04f877c29cf1e95c2fc8154de1da322c7299a3.tar.gz
pardes-2b04f877c29cf1e95c2fc8154de1da322c7299a3.zip
edit: the routing of a text's characters takes the editing context (docs/next-editor.md, R2, first slice): flatSurface, editText, editTextEol, setEditText, setEditTextEnd, setEditTextSpan, paneCursorLines, paneByteAtDisplay, pinPaneCursor, paneWrapWidth, treeIndent, pushUndo, undoStep, stepOwn, selText and vselText take `e: Editor` where they took `*Pardes`, the pane they route to reached through `e.p`; 149 calls in 16 files hand `p.editor()`, nothing else changes; core-test 810 of 949, shell-test 989 of 992, hxdiff 658 / parity 738 / hxgolf 124 with 0 mismatches, replicas pass
Diffstat (limited to 'src/normal.zig')
-rw-r--r--src/normal.zig26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/normal.zig b/src/normal.zig
index d35dd60d..a344269c 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -55,7 +55,7 @@ pub fn selRegexArmed(pane: *Pane) ?struct { pat: []const u8, mode: modal.Normal.
/// had when s/S/K/Alt-K was pressed; the prompt's snapshot of them lives on
/// `pane`.
pub fn applySelRegex(p: *Pardes, pane: *Pane, t: *Text, pat: []const u8, mode: modal.Normal.RegexMode) void {
- const text = edit.flatSurface(p, t) catch |err| return p.reportError(p.view().active, "edit", err);
+ const text = edit.flatSurface(p.editor(), t) catch |err| return p.reportError(p.view().active, "edit", err);
const snap = pane.sel_snap[0..pane.nsel_snap];
var out: [Text.max_selections]modal.Selection = undefined;
var m: usize = 0;
@@ -317,7 +317,7 @@ pub fn nodeSelect(p: *Pardes, pane: *Pane, t: *Text, walk: modal.Normal.NodeWalk
/// with two letters each; the next two keys choose one (`jumpKey`).
fn startJump(p: *Pardes, pane: *Pane, t: *Text) edit.Error!void {
if (t.what != .body) return;
- const text = try edit.flatSurface(p, t);
+ const text = try edit.flatSurface(p.editor(), t);
const cursor = modal.selectionCursor(text, t.primaryRange(text, 0));
const top: usize = @intCast(@max(0, pane.scroll()));
const start = @min(modal.lineStartOffset(text, top), text.len);
@@ -343,7 +343,7 @@ pub fn jumpKey(p: *Pardes, pane: *Pane, t: *Text, key: Key) void {
defer pane.jump.clearRetainingCapacity();
if (chosen >= pane.jump.items.len) return;
const r = pane.jump.items[chosen];
- const text = edit.flatSurface(p, t) catch |err| return p.reportError(p.view().active, "edit", err);
+ const text = edit.flatSurface(p.editor(), t) catch |err| return p.reportError(p.view().active, "edit", err);
if (!t.select) return t.setRange(text, 0, .{ .anchor = @min(r.anchor, r.head), .head = @max(r.anchor, r.head) }, true);
// select mode stretches the primary to the word (helix Movement::Extend)
const pr = t.primaryRange(text, 0);
@@ -467,7 +467,7 @@ pub fn replaySels(p: *Pardes, t: *Text, what: Replay) void {
after = KeyState.of(t);
after_expl = t.vsel.explicit;
}
- const text = edit.flatSurface(p, t) catch {
+ const text = edit.flatSurface(p.editor(), t) catch {
p.multi_stop = true;
break;
};
@@ -490,7 +490,7 @@ pub fn replaySels(p: *Pardes, t: *Text, what: Replay) void {
t.nsel = 0;
return;
}
- const text = edit.flatSurface(p, t) catch |err| return p.reportError(p.view().active, "edit", err);
+ const text = edit.flatSurface(p.editor(), t) catch |err| return p.reportError(p.view().active, "edit", err);
var rs: [Text.max_selections]modal.Selection = undefined;
var st: [Text.max_selections]i32 = undefined;
for (res[0..n], 0..) |r, k| {
@@ -539,7 +539,7 @@ pub fn handleNormal(p: *Pardes, t: *Text, key: Key) void {
}
fn startSelRegex(p: *Pardes, pane: *Pane, t: *Text, mode: modal.Normal.RegexMode) edit.Error!void {
- const text = try edit.flatSurface(p, t);
+ const text = try edit.flatSurface(p.editor(), t);
const got = t.ranges(text, 0, &pane.sel_snap);
pane.nsel_snap = @intCast(got.n);
pane.sel_snap_pri = @intCast(got.pri);
@@ -957,8 +957,8 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error!
pane.sel[sel_slot].state = .none;
};
if (raw_selection and a.role == .yank) return edit.normalYank(p, t);
- edit.pinPaneCursor(p, t);
- const text = try edit.flatSurface(p, t);
+ edit.pinPaneCursor(p.editor(), t);
+ const text = try edit.flatSurface(p.editor(), t);
const range = t.primaryRange(text, 0);
const cur = modal.selectionCursor(text, range);
@@ -991,8 +991,8 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error!
if (nw == slice.len) return;
return pointMove(t, text, range, ls + nw);
},
- .goto_line_down => return verticalMove(t, text, range, true, a.count, edit.paneWrapWidth(p, t)),
- .goto_line_up => return verticalMove(t, text, range, false, a.count, edit.paneWrapWidth(p, t)),
+ .goto_line_down => return verticalMove(t, text, range, true, a.count, edit.paneWrapWidth(p.editor(), t)),
+ .goto_line_up => return verticalMove(t, text, range, false, a.count, edit.paneWrapWidth(p.editor(), t)),
.goto_column => {
const line = modal.lineAtOffset(text, cur);
const ls = modal.lineStartOffset(text, line);
@@ -1041,7 +1041,7 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error!
.replace_prefix => return edit.normalReplaceChar(p, t, a.char),
// `mm`
.match_prefix => {
- const lines = try edit.paneCursorLines(p, t);
+ 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));
},
@@ -1155,8 +1155,8 @@ fn executeNormalAction(p: *Pardes, t: *Text, a: modal.Normal.Action) edit.Error!
.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),
- .undo => return edit.undoStep(p, t, true),
- .redo => return edit.undoStep(p, t, false),
+ .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.
.goto_definition => return exec.runBuiltin(p, .Def, v.active, "", null),
.goto_references => return exec.runBuiltin(p, .Refs, v.active, "", null),