summaryrefslogtreecommitdiff
path: root/src/pardes.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-24 11:57:26 -0300
committerGabriel Schneider <[email protected]>2026-10-24 11:57:35 -0300
commit51903dd947f90381d1a908c488a019289a1c8413 (patch)
treeab5b2574642493c60476e6e9bcd7cc0e1c5e8d9e /src/pardes.zig
parent18d89dcedaed1f8437799621675e88ca47d7cdc1 (diff)
downloadpardes-51903dd947f90381d1a908c488a019289a1c8413.tar.gz
pardes-51903dd947f90381d1a908c488a019289a1c8413.zip
Search converge 3/6: the query pane, line 1 the query and its first word the source, rows made live like Callstack's, the owner's places showing the set, a +Preview promoted in place, Enter freezes, Esc restores
Diffstat (limited to 'src/pardes.zig')
-rw-r--r--src/pardes.zig54
1 files changed, 50 insertions, 4 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index c4011f7d..1b4e9920 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -486,6 +486,8 @@ test {
_ = @import("animation.zig");
_ = @import("pager.zig");
_ = @import("Places.zig");
+ _ = @import("Query.zig");
+ _ = @import("Names.zig");
}
pub const Builtin = builtins.registry.Builtin();
@@ -4402,6 +4404,9 @@ pub const Pardes = struct {
jumps: [MAX_JUMPS]Loc = undefined,
njumps: usize = 0,
jcur: usize = 0,
+ /// The next place tracked is an entry of its own however near the last
+ /// (a query answered: Ctrl-o goes back to where it was asked).
+ jump_force: bool = false,
look_src: [MAX_PANES]u32 = undefined,
n_look_src: usize = 0,
look_walk_owner: ?u32 = null,
@@ -5049,6 +5054,8 @@ pub const Pardes = struct {
// to it reopen it there.
p.noteClosed(pane);
panes.Output.dropUnsaved(p, pane);
+ // A query pane's places, in whatever panes it fed, go with it.
+ if (pane.query != null) panes.Query.release(p, pane);
if (pane.file) |*file| panes.File.leaveTwins(p, file);
const watched = (if (pane.file) |f| f.output == null else false) or pane.hasPdf();
for (p.panes, 0..) |slot, id| if (slot == pane) {
@@ -5084,6 +5091,11 @@ pub const Pardes = struct {
pane.input.deinit(p.gpa);
pane.jump.deinit(p.gpa);
pane.places.deinit(p.gpa);
+ if (pane.query) |q| {
+ q.deinit(p.gpa);
+ p.gpa.destroy(q);
+ pane.query = null;
+ }
panes.terminal.deinitEmulator(pane, p.gpa);
pane.clearCwd();
pane.fs.deinit(p.gpa);
@@ -6121,6 +6133,8 @@ pub const Pardes = struct {
// Each pane's places find a frame's more on a tick, and on any other
// step the ones an edit or a scroll left unfound in the view.
for (p.panes) |slot| if (slot) |pane| pane.places.settle(p, pane, ev == .tick);
+ // Each live query pane's rows, made from what changed this step.
+ panes.Query.produceAll(p, ev == .tick);
_ = p.scratch.reset(.{ .retain_with_limit = memory.limits.scratch_kept });
p.sync();
p.fsReport();
@@ -6450,6 +6464,9 @@ pub const Pardes = struct {
return;
}
if (t == &pane.body and pane.jump.items.len > 0) return normal.jumpKey(p, pane, t, key);
+ // A query pane's line 1 answers Enter, Esc and the stepping keys
+ // itself (Query.zig).
+ if (t == &pane.body and header == null and pane.query != null and panes.Query.key(p, p.active, key)) return;
if (t.mode == .normal and p.macro.replaying == 0 and (hit(key, config.look_key) or hit(key, config.exec_key))) {
// A header's words are the workspace's and column's commands, so
// Enter runs them there, as the execute key does.
@@ -6564,6 +6581,12 @@ pub const Pardes = struct {
p.leader_keys[p.leader_n] = c;
p.leader_n += 1;
const pfx = p.leader_keys[0..p.leader_n];
+ // A path that runs a builtin with its argument (the query pane's
+ // sources with no word of their own).
+ for (config.leader_args) |la| if (std.mem.eql(u8, la.path, pfx)) return exec.runBuiltin(p, la.cmd, p.active, "", la.arg);
+ for (config.leader_args) |la| if (std.mem.startsWith(u8, la.path, pfx)) {
+ p.leader_on = true;
+ };
// a path-less builtin is a row here too (it is the same index Help
// reads), and SPC cannot reach one — so both scans skip it
for (builtin_rows) |row| {
@@ -7017,6 +7040,21 @@ pub const Pardes = struct {
return;
}
+ // The lists of places: into the asking text's query pane (made or
+ // reused), line 1 their word, the places in that text its places.
+ const listed: ?panes.Query.Source = switch (w.kind) {
+ .references => .refs,
+ .definition => .defs,
+ .implementation => .impls,
+ .diagnostics => .diagnostics,
+ else => null,
+ };
+ if (listed) |source| if (pane.file != null and pane.query == null and !p.exec_header) {
+ p.fs.refilled = null;
+ panes.Query.fillList(p, w.pane, source, rows);
+ p.fs.lsp_result = if (panes.Query.ofOwner(p, pane.serial)) |qid| p.panes[qid].?.serial else null;
+ return;
+ };
const dir = if (pane.file) |f| panes.Dir.ofName(f.path) else pane.cwdSlice();
// A Callstack page that stops short ends in its marker: said as a
// row naming the word that shows the next page, and kept.
@@ -7285,6 +7323,11 @@ pub const Pardes = struct {
p.jcur = @min(cur, w -| 1);
const pane = p.panes[p.active] orelse return;
+ // A query being typed moves the owner's selection to show, never a
+ // jump; its pane is no place to come back to either.
+ if (pane.query) |q| if (!q.frozen) return;
+ const force = p.jump_force;
+ p.jump_force = false;
const now: Loc = .{
.pane = @intCast(p.active),
.serial = pane.serial,
@@ -7292,14 +7335,14 @@ pub const Pardes = struct {
.col = if (pane.pdfPage() != null) 0 else if (pane.body.cur_pinned) @intCast(@max(0, pane.body.cur_col) + 1) else 0,
.path_hash = if (recentDot(pane)) |d| std.hash.Wyhash.hash(0, d.path) else 0,
};
- if (p.njumps > 0 and p.samePlace(p.jumps[p.jcur], now)) {
+ if (!force and p.njumps > 0 and p.samePlace(p.jumps[p.jcur], now)) {
p.jumps[p.jcur] = now; // same visit; the entry IS where you are
return;
}
// a new jump made from the middle of the list drops everything ahead of
// it, the way vim's does: the future you did not take is not history.
if (p.njumps > 0) p.njumps = p.jcur + 1;
- if (p.njumps >= 2 and p.samePlace(p.jumps[p.njumps - 2], now)) {
+ if (!force and p.njumps >= 2 and p.samePlace(p.jumps[p.njumps - 2], now)) {
p.jumps[p.njumps - 2] = p.jumps[p.njumps - 1];
p.jumps[p.njumps - 1] = now;
p.jcur = p.njumps - 1;
@@ -7588,6 +7631,7 @@ pub const Pardes = struct {
if (p.chrome_animation.isActive() or p.presentation.animating()) return next;
// Places still to find resume on the next frame.
for (p.panes) |slot| if (slot) |pane| if (pane.places.busy(pane)) return next;
+ if (panes.Query.busy(p)) return next;
var frames: ?u64 = null;
if (p.look_hover_wait) |waiting| {
const delay = config.look_preview_delay_frames orelse return next;
@@ -8003,11 +8047,13 @@ test "a prompt is typed on its own line in the notice band and leaves the tag ro
const tag_before = try std.testing.allocator.dupe(Cell, p.surface.tag_layers[0].cells);
defer std.testing.allocator.free(tag_before);
- p.update(.{ .key = .{ .cp = '/' } });
+ // `s` keeps a prompt on the band (a text's `/` is its query pane's
+ // line 1 now, Query.zig).
+ p.update(.{ .key = .{ .cp = 's' } });
p.update(.{ .key = .{ .cp = 't', .text = "tw" } });
p.update(.{ .key = .{ .cp = Key.left } });
try std.testing.expect(pane.prompt == .search and pane.focus == .body);
- try std.testing.expectEqualStrings(config.search_marker ++ "tw", pane.promptText().?);
+ try std.testing.expectEqualStrings(config.select_marker ++ "tw", pane.promptText().?);
_ = frame.reset(.retain_capacity);
_ = try p.render(frame.allocator());
// The tagline is exactly what it was: nothing of the prompt is in it.