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

Fix crash if zls.json is empty (#1034)

Browse Source 
Fixes #1033
This commit is contained in:
dec05eba 2023-03-05 20:09:39 +01:00 committed by GitHub
parent 121f68b970
commit 76ee4b80fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/configuration.zig
View File

@ -32,7 +32,10 @@ pub fn loadFromFile(allocator: std.mem.Allocator, file_path: []const u8) ?Config
// TODO: use a better error reporting system or use ZON instead of JSON // TODO: use a better error reporting system or use ZON instead of JSON
// TODO: report errors using "textDocument/publishDiagnostics" // TODO: report errors using "textDocument/publishDiagnostics"
var config = std.json.parse(Config, &token_stream, parse_options) catch |err| { var config = std.json.parse(Config, &token_stream, parse_options) catch |err| {
const loc = std.zig.findLineColumn(file_buf, token_stream.i); const loc = if (token_stream.slice.len == 0)
std.zig.Loc{ .line = 0, .column = 0, .source_line = "" }
else
std.zig.findLineColumn(file_buf, token_stream.i);
logger.warn("{s}:{d}:{d}: Error while parsing configuration file {}", .{ file_path, loc.line + 1, loc.column, err }); logger.warn("{s}:{d}:{d}: Error while parsing configuration file {}", .{ file_path, loc.line + 1, loc.column, err });
if (err == error.InvalidValueBegin) { if (err == error.InvalidValueBegin) {
logger.warn("Maybe your configuration file contains a trailing comma", .{}); logger.warn("Maybe your configuration file contains a trailing comma", .{});