summaryrefslogtreecommitdiff
path: root/src/Places.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Places.zig')
-rw-r--r--src/Places.zig7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Places.zig b/src/Places.zig
index 0ed64ae7..ddbbc271 100644
--- a/src/Places.zig
+++ b/src/Places.zig
@@ -604,9 +604,10 @@ pub fn step(set: *Places, p: *Pardes, pane: *Pane, forward: bool, count: u32, ad
/// query's always; a search's while it is what the register says (an `s`,
/// a `/` elsewhere or `"a` since makes them helix's register search again).
pub fn answersN(set: *const Places, p: *Pardes, pane: *Pane) bool {
+ const v = p.view();
if (!set.shows(pane) and !set.started) return false;
- if (set.provenance != .search) return p.register == 0;
- const name = if (p.register != 0) p.register else p.registers.last_search;
+ if (set.provenance != .search) return v.register == 0;
+ const name = if (v.register != 0) v.register else p.registers.last_search;
const pat = p.registers.value(name, 0) orelse return false;
if (!set.literal) return std.mem.eql(u8, pat, set.pattern);
var spelled: std.ArrayList(u8) = .empty;
@@ -883,7 +884,7 @@ test "a session's places loaded from its dump find what an edit makes as the ses
defer b.deinit();
try std.testing.expectEqual(pardes.walk.digest(Pardes, a), pardes.walk.digest(Pardes, b));
for ([_]*Pardes{ a, b }) |p| {
- const pn = p.panes[p.active].?;
+ const pn = p.panes[p.view().active].?;
const new = try gpa.dupe(u8, "alpha beta\ngamma alpha alpha\n");
File.setContentSpan(p, &pn.file.?, new, null);
pn.places.fill(p, pn, 0, frame_steps);