andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed zls path in session tests

Browse Source
This commit is contained in:
Alexandros Naskos 2021-05-03 15:46:24 +03:00
parent 91643c04c9
commit f8b9d3bfcb
No known key found for this signature in database
GPG Key ID: 02BF2E72B0EA32D2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/sessions.zig
View File

@ -40,7 +40,6 @@ const Server = struct {
const expected = expect orelse return; const expected = expect orelse return;
var from_server = self.process.stdout.?.reader(); var from_server = self.process.stdout.?.reader();
while (true) { while (true) {
const header = headerPkg.readRequestHeader(allocator, from_server) catch |err| { const header = headerPkg.readRequestHeader(allocator, from_server) catch |err| {
switch (err) { switch (err) {
@ -48,21 +47,22 @@ const Server = struct {
else => return err, else => return err,
} }
}; };
defer header.deinit(allocator); defer header.deinit(allocator);
var resonse_bytes = try allocator.alloc(u8, header.content_length); var response_bytes = try allocator.alloc(u8, header.content_length);
defer allocator.free(resonse_bytes); defer allocator.free(response_bytes);
if ((try from_server.readAll(resonse_bytes)) != header.content_length) { if ((try from_server.readAll(response_bytes)) != header.content_length) {
return error.InvalidResponse; return error.InvalidResponse;
} }
// std.debug.print("{s}\n", .{resonse_bytes}); // std.debug.print("{s}\n", .{resonse_bytes});
const json_fmt = "{\"jsonrpc\":\"2.0\",\"id\":"; const json_fmt = "{\"jsonrpc\":\"2.0\",\"id\":";
if (!std.mem.startsWith(u8, resonse_bytes, json_fmt)) { if (!std.mem.startsWith(u8, response_bytes, json_fmt)) {
try extractError(resonse_bytes); try extractError(response_bytes);
continue; continue;
} }
const rest = resonse_bytes[json_fmt.len..]; const rest = response_bytes[json_fmt.len..];
const id_end = std.mem.indexOfScalar(u8, rest, ',') orelse return error.InvalidResponse; const id_end = std.mem.indexOfScalar(u8, rest, ',') orelse return error.InvalidResponse;
const id = try std.fmt.parseInt(u32, rest[0..id_end], 10); const id = try std.fmt.parseInt(u32, rest[0..id_end], 10);
@ -107,7 +107,7 @@ const Server = struct {
fn startZls() !*std.ChildProcess { fn startZls() !*std.ChildProcess {
std.debug.print("\n", .{}); std.debug.print("\n", .{});
var process = try std.ChildProcess.init(&[_][]const u8{"zig-cache/bin/zls" ++ suffix}, allocator); var process = try std.ChildProcess.init(&[_][]const u8{"zig-out/bin/zls" ++ suffix}, allocator);
process.stdin_behavior = .Pipe; process.stdin_behavior = .Pipe;
process.stdout_behavior = .Pipe; process.stdout_behavior = .Pipe;
process.stderr_behavior = .Pipe; //std.ChildProcess.StdIo.Inherit; process.stderr_behavior = .Pipe; //std.ChildProcess.StdIo.Inherit;