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

Fixed compilation for latest zig master

Browse Source
This commit is contained in:
Alexandros Naskos 2021-01-07 10:35:36 +02:00
parent 82d6258ab2
commit eefee4759c
No known key found for this signature in database
GPG Key ID: 02BF2E72B0EA32D2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/document_store.zig
View File

@ -114,7 +114,7 @@ fn loadPackages(context: LoadPackagesContext) !void {
allocator.free(old_pkg.uri); allocator.free(old_pkg.uri);
} }
build_file.packages.shrink(allocator, 0); build_file.packages.shrinkAndFree(allocator, 0);
var line_it = std.mem.split(zig_run_result.stdout, "\n"); var line_it = std.mem.split(zig_run_result.stdout, "\n");
while (line_it.next()) |line| { while (line_it.next()) |line| {
if (std.mem.indexOfScalar(u8, line, '\x00')) |zero_byte_idx| { if (std.mem.indexOfScalar(u8, line, '\x00')) |zero_byte_idx| {

4
src/main.zig
View File

@ -36,7 +36,7 @@ pub fn log(
} }
// After shutdown, pipe output to stderr // After shutdown, pipe output to stderr
if (!keep_running) { if (!keep_running) {
std.debug.print("[{}-{}] " ++ format, .{ @tagName(message_level), @tagName(scope) } ++ args); std.debug.print("[{s}-{s}] " ++ format, .{ @tagName(message_level), @tagName(scope) } ++ args);
return; return;
} }
@ -1097,7 +1097,7 @@ fn initializeHandler(arena: *std.heap.ArenaAllocator, id: types.RequestId, req:
.signatureHelpProvider = .{ .signatureHelpProvider = .{
.triggerCharacters = &[_][]const u8{ "(", "," }, .triggerCharacters = &[_][]const u8{ "(", "," },
}, },
.textDocumentSync = .Incremental, .textDocumentSync = .Full,
.renameProvider = true, .renameProvider = true,
.completionProvider = .{ .completionProvider = .{
.resolveProvider = false, .resolveProvider = false,

2
tests/sessions.zig
View File

@ -143,6 +143,6 @@ test "Requesting utf-8 offset encoding" {
try sendRequest(shutdown_message, process); try sendRequest(shutdown_message, process);
try consumeOutputAndWait(process, .{ try consumeOutputAndWait(process, .{
\\{"jsonrpc":"2.0","id":0,"result":{"offsetEncoding":"utf-8","capabilities":{"signatureHelpProvider":{"triggerCharacters":["(",","]},"textDocumentSync":2,"renameProvider":true,"completionProvider":{"resolveProvider":false,"triggerCharacters":[".",":","@"]},"documentHighlightProvider":false,"hoverProvider":true,"codeActionProvider":false,"declarationProvider":true,"definitionProvider":true,"typeDefinitionProvider":true,"implementationProvider":false,"referencesProvider":true,"documentSymbolProvider":true,"colorProvider":false,"documentFormattingProvider":true,"documentRangeFormattingProvider":false,"foldingRangeProvider":false,"selectionRangeProvider":false,"workspaceSymbolProvider":false,"rangeProvider":false,"documentProvider":true,"workspace":{"workspaceFolders":{"supported":false,"changeNotifications":false}},"semanticTokensProvider":{"full":true,"range":false,"legend":{"tokenTypes":["type","parameter","variable","tagField","field","errorTag","function","keyword","comment","string","number","operator","builtin","label","keywordLiteral"],"tokenModifiers":["namespace","struct","enum","union","opaque","definition","async","documentation","generic"]}}},"serverInfo":{"name":"zls","version":"0.1.0"}}} \\{"jsonrpc":"2.0","id":0,"result":{"offsetEncoding":"utf-8","capabilities":{"signatureHelpProvider":{"triggerCharacters":["(",","]},"textDocumentSync":1,"renameProvider":true,"completionProvider":{"resolveProvider":false,"triggerCharacters":[".",":","@"]},"documentHighlightProvider":false,"hoverProvider":true,"codeActionProvider":false,"declarationProvider":true,"definitionProvider":true,"typeDefinitionProvider":true,"implementationProvider":false,"referencesProvider":true,"documentSymbolProvider":true,"colorProvider":false,"documentFormattingProvider":true,"documentRangeFormattingProvider":false,"foldingRangeProvider":false,"selectionRangeProvider":false,"workspaceSymbolProvider":false,"rangeProvider":false,"documentProvider":true,"workspace":{"workspaceFolders":{"supported":false,"changeNotifications":false}},"semanticTokensProvider":{"full":true,"range":false,"legend":{"tokenTypes":["type","parameter","variable","tagField","field","errorTag","function","keyword","comment","string","number","operator","builtin","label","keywordLiteral"],"tokenModifiers":["namespace","struct","enum","union","opaque","definition","async","documentation","generic"]}}},"serverInfo":{"name":"zls","version":"0.1.0"}}}
}); });
} }