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

resolve relative include directories

Browse Source
This commit is contained in:
Techatrix 2023-03-13 21:13:50 +01:00 committed by Lee Cannon
parent ef4a0607fb
commit dc7efa591c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/DocumentStore.zig
View File

@ -909,7 +909,6 @@ pub fn collectDependencies(
}
}
/// TODO resolve relative paths
pub fn collectIncludeDirs(
store: *const DocumentStore,
allocator: std.mem.Allocator,
@ -932,7 +931,17 @@ pub fn collectIncludeDirs(
include_dirs.appendSliceAssumeCapacity(native_include_dirs);
for (build_file_includes_paths) |include_path| {
include_dirs.appendAssumeCapacity(try allocator.dupe(u8, include_path));
const absolute_path = if (std.fs.path.isAbsolute(include_path))
try allocator.dupe(u8, include_path)
else blk: {
const build_file_uri = handle.associated_build_file.?;
const build_file_dir = std.fs.path.dirname(build_file_uri).?;
const build_file_path = try URI.parse(allocator, build_file_dir);
defer allocator.free(build_file_path);
break :blk try std.fs.path.join(allocator, &.{ build_file_path, include_path });
};
include_dirs.appendAssumeCapacity(absolute_path);
}
}