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

provide build_runner command on failure (#569)

Browse Source
This commit is contained in:
Lee Cannon 2022-08-03 18:43:34 +01:00 committed by GitHub
parent f2315e0c7a
commit d83e37d99a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/DocumentStore.zig
View File

@ -134,24 +134,26 @@ fn loadPackages(context: LoadPackagesContext) !void {
defer if (context.build_file_path == null) allocator.free(build_file_path);
const directory_path = build_file_path[0 .. build_file_path.len - "build.zig".len];
const args: []const []const u8 = &[_][]const u8{
zig_exe_path,
"run",
build_runner_path,
"--cache-dir",
build_runner_cache_path,
"--pkg-begin",
"@build@",
build_file_path,
"--pkg-end",
"--",
zig_exe_path,
directory_path,
context.cache_root,
context.global_cache_root,
};
const zig_run_result = try std.ChildProcess.exec(.{
.allocator = allocator,
.argv = &[_][]const u8{
zig_exe_path,
"run",
build_runner_path,
"--cache-dir",
build_runner_cache_path,
"--pkg-begin",
"@build@",
build_file_path,
"--pkg-end",
"--",
zig_exe_path,
directory_path,
context.cache_root,
context.global_cache_root,
},
.argv = args,
});
defer {
@ -159,6 +161,16 @@ fn loadPackages(context: LoadPackagesContext) !void {
allocator.free(zig_run_result.stderr);
}
errdefer blk: {
const joined = std.mem.join(allocator, " ", args) catch break :blk;
defer allocator.free(joined);
log.err(
"Failed to execute build runner to collect packages, command:\n{s}\nError: {s}",
.{ joined, zig_run_result.stderr },
);
}
switch (zig_run_result.term) {
.Exited => |exit_code| {
if (exit_code == 0) {
@ -271,7 +283,7 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
.cache_root = self.zig_cache_root,
.global_cache_root = self.zig_global_cache_root,
}) catch |err| {
log.warn("Failed to load packages of build file {s} (error: {})", .{ build_file.uri, err });
log.err("Failed to load packages of build file {s} (error: {})", .{ build_file.uri, err });
};
try self.build_files.append(self.allocator, build_file);
@ -540,7 +552,7 @@ pub fn applySave(self: *DocumentStore, handle: *Handle) !void {
.cache_root = self.zig_cache_root,
.global_cache_root = self.zig_global_cache_root,
}) catch |err| {
log.warn("Failed to load packages of build file {s} (error: {})", .{ build_file.uri, err });
log.err("Failed to load packages of build file {s} (error: {})", .{ build_file.uri, err });
};
}
}