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

workaround zig tarball bug (#599)

Browse Source
This commit is contained in:
Lee Cannon 2022-08-22 23:01:44 +01:00 committed by GitHub
parent b4ccfeecef
commit eb60f75413
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/DocumentStore.zig
View File

@ -1052,10 +1052,15 @@ fn stdUriFromLibPath(allocator: std.mem.Allocator, zig_lib_path: ?[]const u8) !?
if (zig_lib_path) |zpath| { if (zig_lib_path) |zpath| {
const std_path = std.fs.path.resolve(allocator, &[_][]const u8{ const std_path = std.fs.path.resolve(allocator, &[_][]const u8{
zpath, "./std/std.zig", zpath, "./std/std.zig",
}) catch |err| { }) catch |first_std_err| blk: {
log.debug("Failed to resolve zig std library path, error: {}", .{err}); // workaround for https://github.com/ziglang/zig/issues/12516
break :blk std.fs.path.resolve(allocator, &[_][]const u8{
zpath, "./zig/std/std.zig",
}) catch {
log.debug("Failed to resolve zig std library path, error: {}", .{first_std_err});
return null; return null;
}; };
};
defer allocator.free(std_path); defer allocator.free(std_path);
// Get the std_path as a URI, so we can just append to it! // Get the std_path as a URI, so we can just append to it!