From 23ff1aa588c5dfcb194543c949ebd87cbb12e725 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Tue, 29 Sep 2026 11:18:33 -0300 Subject: A repeated identical search reads back the +Search it left as it was When a Find or Grep found exactly what its +Search already held, the pane was kept but not marked as the one the search touched, so the exec read back the pane it ran in. Co-Authored-By: Claude Opus 5.5 --- src/Output.zig | 1 + src/ninep/ctl.zig | 3 +++ 2 files changed, 4 insertions(+) (limited to 'src') diff --git a/src/Output.zig b/src/Output.zig index 495dbc43..99246b4a 100644 --- a/src/Output.zig +++ b/src/Output.zig @@ -448,6 +448,7 @@ pub fn fillResults(p: *Pardes, id: usize, dir: []const u8, from: Origin, arg: [] if (!locations.sameInput(content, rf.content, rf.location_rows, p.locations_config.layout)) continue; try setArg(output, arg); p.gpa.free(content); + p.fs.refilled = rp.serial; p.active = id; if (traits(from).steps) { pane.search_pane = i; diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig index 40a1a7cd..2dc3a51b 100644 --- a/src/ninep/ctl.zig +++ b/src/ninep/ctl.zig @@ -1860,6 +1860,9 @@ test "Grep with no hit says grep: no match and opens nothing, a missing pane dir try testing.expect(std.mem.indexOf(u8, found.file.?.content, "other.txt") != null); try testing.expectEqual(grepped.serial, found.serial); try testing.expect(std.mem.indexOf(u8, found.file.?.content, "bravo here") == null); + // The same Find again reads back the +Search, not the pane it ran in. + try testing.expectEqual(Status.ok, wr(p, Node.of(serialOf(p), .exec), "Find other\n").reply.status); + try testing.expectEqualStrings(try std.fmt.bufPrint(&line, "{d}\n", .{found.serial}), rd(p, root_exec, 0, 64).bytes); // A Grep run from the +Search itself fills that one, never a second. try testing.expectEqual(Status.ok, wr(p, Node.of(found.serial, .exec), "Grep bravo\n").reply.status); try testing.expectEqualStrings(try std.fmt.bufPrint(&line, "{d}\n", .{found.serial}), rd(p, root_exec, 0, 64).bytes); -- cgit v1.3