1 files changed, 14 insertions, 1 deletions
diff --git a/src/File.zig b/src/File.zig
index 26585f77..b8368482 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -70,9 +70,19 @@ pub const State = struct {
     tree_context: bool = false,
     context_declarations: []syntax.ContextDeclaration = &.{},
     context_revision: ?u32 = null,
+    /// The whole file's parse for the keys that walk its nodes (Alt-o and
+    /// kin), made on the first of them after an edit and kept until the next
+    /// one: `syntax.parseTree`'s, opaque here.
+    node_tree: ?*anyopaque = null,
+    node_tree_revision: u32 = 0,
+    /// helix's object_selections: what Alt-o grew from, for Alt-i to go back
+    /// to; gpa-owned ranges and the primary's index.
+    node_history: std.ArrayList(NodeStep) = .empty,
     history: *History,
 };
 
+pub const NodeStep = struct { ranges: []modal.Selection, primary: usize };
+
 pub fn dumpPane(
     arena: std.mem.Allocator,
     pane: *const Pane,
@@ -817,6 +827,9 @@ pub fn deinit(p: *Pardes, pane: *Pane, file: *State) void {
     if (file.highlights.len > 0) p.tree_sitter_gpa.free(file.highlights);
     locations.freeRows(p.gpa, file.location_rows);
     if (file.context_declarations.len > 0) p.tree_sitter_gpa.free(file.context_declarations);
+    if (file.node_tree) |tree| syntax.freeTree(tree);
+    for (file.node_history.items) |step| p.gpa.free(step.ranges);
+    file.node_history.deinit(p.gpa);
     for (file.history.undo[0..file.history.undo_len]) |snap| p.gpa.free(snap.content);
     for (file.history.redo[0..file.history.redo_len]) |snap| p.gpa.free(snap.content);
     p.gpa.destroy(file.history);
@@ -1130,7 +1143,7 @@ pub fn drawGutter(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16,
     const goff = pane.scroll();
     const gcur = Terminal.gridCursor(pane);
     const gcrow = if (pane.body.cur_pinned) pane.body.cur_row else @as(i32, gcur.y) + goff;
-    const typing_body = pane.focus == .body and (pane.prompt == .none or pane.prompt == .del_side);
+    const typing_body = pane.focus == .body and (pane.prompt == .none or pane.prompt == .del_side or pane.prompt == .repl_choice);
     const cur_line: i32 = if (active and typing_body) gcrow else std.math.minInt(i32);
     // the body's first row, the way renderPane derives it (Tagbottom)
     const body_y = p.bodyTop(pane, r);