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

correctly handle path to uri conversion

Browse Source
This commit is contained in:
Techatrix 2022-08-20 15:34:36 +02:00
parent d57f8e3a64
commit f543659e31
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/DocumentStore.zig
View File

@ -605,12 +605,15 @@ fn translate(self: *DocumentStore, handle: *Handle, source: []const u8) !?[]cons
}; };
defer self.allocator.free(include_dirs); defer self.allocator.free(include_dirs);
return translate_c.translate( const file_path = (try translate_c.translate(
self.allocator, self.allocator,
self.config, self.config,
include_dirs, include_dirs,
source, source,
); )) orelse return null;
defer self.allocator.free(file_path);
return try URI.fromPath(self.allocator, file_path);
} }
fn refreshDocument(self: *DocumentStore, handle: *Handle) !void { fn refreshDocument(self: *DocumentStore, handle: *Handle) !void {

5
src/translate_c.zig
View File

@ -161,10 +161,7 @@ pub fn translate(allocator: std.mem.Allocator, config: Config, include_dirs: []c
return switch (result.term) { return switch (result.term) {
.Exited => |code| if (code == 0) { .Exited => |code| if (code == 0) {
return try std.mem.join(allocator, "", &.{ return try allocator.dupe(u8, std.mem.sliceTo(result.stdout, '\n'));
"file://",
std.mem.sliceTo(result.stdout, '\n'),
});
} else { } else {
// TODO convert failure to `textDocument/publishDiagnostics` // TODO convert failure to `textDocument/publishDiagnostics`
std.log.err("zig translate-c process failed, code: {}, stderr: '{s}'", .{ code, result.stderr }); std.log.err("zig translate-c process failed, code: {}, stderr: '{s}'", .{ code, result.stderr });