summaryrefslogtreecommitdiff
path: root/src/gui/gui.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/gui.zig')
-rw-r--r--src/gui/gui.zig12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index cf35a5fa..a54a4b7b 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -824,7 +824,7 @@ test "GUI completion failure survives backlog and leaves the document unchanged"
const pane = try core.setTestFile("abc");
pane.body.cur_col = 1;
core.lspRequest(core.active, .completion, "");
- const id = core.lsp_wait.?.id;
+ const id = core.lsp_ask.wait.?.id;
var queue: Queue = .{ .io = std.testing.io, .gpa = gpa, .lsp_allocator = gpa, .lsp_id = id };
defer queue.deinit();
queue.acceptReader(0, 1);
@@ -844,7 +844,7 @@ test "GUI completion failure survives backlog and leaves the document unchanged"
shell.gens = &gens;
shell.ptys = &ptys;
shell.drainQueue();
- try std.testing.expect(core.lsp_wait == null);
+ try std.testing.expect(core.lsp_ask.wait == null);
try std.testing.expectEqualStrings("abc", pane.file.?.content);
try std.testing.expectEqual(@as(i32, 1), pane.body.cur_col);
}
@@ -899,7 +899,7 @@ test "GUI worker setup failures finish matching LSP and pipe requests" {
var tasks: PipeTasks = .{};
core.lspRequest(core.active, .status, "");
const req: host_io.Lsp.Request = .{
- .id = core.lsp_wait.?.id,
+ .id = core.lsp_ask.wait.?.id,
.kind = .status,
.pane = @intCast(core.active),
.offset = 0,
@@ -919,7 +919,7 @@ test "GUI worker setup failures finish matching LSP and pipe requests" {
shell.threads_ok = false;
lsp(&shell, req);
}
- try std.testing.expect(core.lsp_wait == null);
+ try std.testing.expect(core.lsp_ask.wait == null);
try std.testing.expectEqualStrings("abc", pane.file.?.content);
pane.body.cur_col = 2;
@@ -4133,7 +4133,7 @@ fn guiNow(ctx: ?*anyopaque) u64 {
const s = shellOf(ctx);
if (s.waited) {
s.waited = false;
- if (s.mail_only and s.peers.count() > 0 and s.core.clock_started) return s.core.now_ns;
+ if (s.mail_only and s.peers.count() > 0 and s.core.clock.started) return s.core.clock.now_ns;
}
return s.test_clock orelse s.paced_ns orelse c.SDL_GetTicksNS();
}
@@ -4797,7 +4797,7 @@ const GlideRun = struct {
frames: usize = 0,
fn play(seq: *GlideRun, g: *Gui, core: *pardes.Pardes, gpa: std.mem.Allocator, arena: *std.heap.ArenaAllocator, script: []const Step, frames: usize) !void {
- var now: u64 = core.now_ns;
+ var now: u64 = core.clock.now_ns;
var next: usize = 0;
for (0..frames) |frame| {
while (next < script.len and script[next].frame == frame) : (next += 1) core.update(.{ .key = script[next].key });