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

update cimport diagnostic collection

Browse Source
This commit is contained in:
Techatrix 2022-10-10 19:16:23 +02:00
parent d6ef330984
commit 2bc83741fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Server.zig
View File

@ -175,17 +175,19 @@ fn publishDiagnostics(server: *Server, writer: anytype, handle: DocumentStore.Ha
}); });
} }
for (handle.cimports) |cimport| { for (handle.cimports.items(.hash)) |hash, i| {
if (cimport.result != .failure) continue; const result = server.document_store.cimports.get(hash) orelse continue;
const stderr = std.mem.trim(u8, cimport.result.failure, " "); if (result != .failure) continue;
const stderr = std.mem.trim(u8, result.failure, " ");
var pos_and_diag_iterator = std.mem.split(u8, stderr, ":"); var pos_and_diag_iterator = std.mem.split(u8, stderr, ":");
_ = pos_and_diag_iterator.next(); // skip file path _ = pos_and_diag_iterator.next(); // skip file path
_ = pos_and_diag_iterator.next(); // skip line _ = pos_and_diag_iterator.next(); // skip line
_ = pos_and_diag_iterator.next(); // skip character _ = pos_and_diag_iterator.next(); // skip character
const node = handle.cimports.items(.node)[i];
try diagnostics.append(allocator, .{ try diagnostics.append(allocator, .{
.range = offsets.nodeToRange(handle.tree, cimport.node, server.offset_encoding), .range = offsets.nodeToRange(handle.tree, node, server.offset_encoding),
.severity = .Error, .severity = .Error,
.code = "cImport", .code = "cImport",
.source = "zls", .source = "zls",
@ -288,7 +290,8 @@ fn publishDiagnostics(server: *Server, writer: anytype, handle: DocumentStore.Ha
.source = "zls", .source = "zls",
.message = try allocator.dupe(u8, pos_and_diag_iterator.rest()), .message = try allocator.dupe(u8, pos_and_diag_iterator.rest()),
}); });
}
if (server.config.highlight_global_var_declarations) { if (server.config.highlight_global_var_declarations) {
const main_tokens = tree.nodes.items(.main_token); const main_tokens = tree.nodes.items(.main_token);
const tags = tree.tokens.items(.tag); const tags = tree.tokens.items(.tag);