summaryrefslogtreecommitdiff
path: root/src/macos.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/macos.zig')
-rw-r--r--src/macos.zig18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/macos.zig b/src/macos.zig
index 9956d706..d7e9f454 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -314,9 +314,9 @@ test "mac queued results never cancel a newer LSP request" {
defer st.config_arena.deinit();
defer st.inbox.close();
core.lspRequest(0, .status, "");
- const old_id = core.lsp_wait.?.id;
+ const old_id = core.lsp_ask.wait.?.id;
core.lspRequest(0, .status, "");
- const current_id = core.lsp_wait.?.id;
+ const current_id = core.lsp_ask.wait.?.id;
st.inbox.lsp_id = current_id;
st.inbox.lsp_task = .{ .id = current_id, .future = .{ .any_future = null, .result = {} } };
// The inbox turns the superseded answer away.
@@ -325,11 +325,11 @@ test "mac queued results never cancel a newer LSP request" {
_ = drainInbox(&st);
try std.testing.expect(st.inbox.lsp_task != null);
try std.testing.expectEqual(current_id, st.inbox.lsp_task.?.id);
- try std.testing.expectEqual(current_id, core.lsp_wait.?.id);
+ try std.testing.expectEqual(current_id, core.lsp_ask.wait.?.id);
st.inbox.push(.{ .lsp = .{ .id = current_id, .rows = try gpa.dupe(u8, "") } });
try std.testing.expect(drainInbox(&st));
try std.testing.expect(st.inbox.lsp_task == null);
- try std.testing.expect(core.lsp_wait == null);
+ try std.testing.expect(core.lsp_ask.wait == null);
}
test "mac worker setup failures finish matching LSP and pipe requests" {
@@ -358,14 +358,14 @@ test "mac worker setup failures finish matching LSP and pipe requests" {
defer st.inbox.close();
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,
.arg = "",
};
lspRequest(&st, 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;
@@ -1229,7 +1229,7 @@ test "mac Restore keeps host state and rejects callbacks from the old core" {
try std.testing.expect(st.rotate_coasting);
core.lspRequest(0, .status, "");
- const old_request = core.lsp_wait.?.id;
+ const old_request = core.lsp_ask.wait.?.id;
st.inbox.lsp_id = old_request;
st.inbox.lsp_task = .{ .id = old_request, .future = .{ .any_future = null, .result = {} } };
st.inbox.push(.{ .lsp = .{ .id = old_request, .rows = try gpa.dupe(u8, "old result") } });
@@ -1263,14 +1263,14 @@ test "mac Restore keeps host state and rejects callbacks from the old core" {
try std.testing.expect(!st.cwd_stale[0]);
st.core.lspRequest(0, .status, "");
- const new_request = st.core.lsp_wait.?.id;
+ const new_request = st.core.lsp_ask.wait.?.id;
try std.testing.expect(new_request > old_request);
st.inbox.lsp_id = new_request;
st.inbox.lsp_task = .{ .id = new_request, .future = .{ .any_future = null, .result = {} } };
st.inbox.push(.{ .lsp = .{ .id = new_request, .rows = &.{} } });
try std.testing.expect(drainInbox(&st));
try std.testing.expect(st.inbox.lsp_task == null);
- try std.testing.expect(st.core.lsp_wait == null);
+ try std.testing.expect(st.core.lsp_ask.wait == null);
const pane = st.core.panes[0].?;
pane.body.cur_col = 4;