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

Remove use of notice log level

Browse Source 
Removes the use of the notice log level.
Cleans up resulting code, the if else statement with nested switches was
converted into a single switch statement with the same behaviour, but
without relying on the enumToInt builtin.
This commit is contained in:
antlilja 2021-10-25 12:56:04 +02:00 committed by Auguste Rame
parent 0f65093812
commit 80f09831bc
1 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/main.zig
View File

@ -33,7 +33,7 @@ pub const log_level = .debug;
var actual_log_level: std.log.Level = switch (zig_builtin.mode) { var actual_log_level: std.log.Level = switch (zig_builtin.mode) {
.Debug => .debug, .Debug => .debug,
else => .notice, else => .info,
}; };
pub fn log(comptime message_level: std.log.Level, comptime scope: @Type(.EnumLiteral), comptime format: []const u8, args: anytype) void { pub fn log(comptime message_level: std.log.Level, comptime scope: @Type(.EnumLiteral), comptime format: []const u8, args: anytype) void {
@ -54,43 +54,23 @@ pub fn log(comptime message_level: std.log.Level, comptime scope: @Type(.EnumLit
return; return;
}; };
if (@enumToInt(message_level) <= @enumToInt(std.log.Level.notice)) { const message_type: types.MessageType = switch (message_level) {
const message_type: types.MessageType = switch (message_level) { .debug => .Log,
.info => .Log, .info => .Info,
.notice => .Info, .warn => .Warning,
.warn => .Warning, .err => .Error,
.err => .Error, };
else => .Error, send(&arena, types.Notification{
}; .method = "window/showMessage",
send(&arena, types.Notification{ .params = types.Notification.Params{
.method = "window/showMessage", .ShowMessage = .{
.params = types.Notification.Params{ .type = message_type,
.ShowMessage = .{ .message = message,
.type = message_type,
.message = message,
},
}, },
}) catch |err| { },
std.debug.print("Failed to send show message notification (error: {}).\n", .{err}); }) catch |err| {
}; std.debug.print("Failed to send show message notification (error: {}).\n", .{err});
} else { };
const message_type: types.MessageType = if (message_level == .debug)
.Log
else
.Info;
send(&arena, types.Notification{
.method = "window/logMessage",
.params = types.Notification.Params{
.LogMessage = .{
.type = message_type,
.message = message,
},
},
}) catch |err| {
std.debug.print("Failed to send show message notification (error: {}).\n", .{err});
};
}
} }
// Code is largely based off of https://github.com/andersfr/zig-lsp/blob/master/server.zig // Code is largely based off of https://github.com/andersfr/zig-lsp/blob/master/server.zig
@ -1275,9 +1255,9 @@ fn initializeHandler(arena: *std.heap.ArenaAllocator, id: types.RequestId, req:
}, },
}); });
logger.notice("zls initialized", .{}); logger.info("zls initialized", .{});
logger.info("{}", .{client_capabilities}); logger.info("{}", .{client_capabilities});
logger.notice("Using offset encoding: {s}", .{std.meta.tagName(offset_encoding)}); logger.info("Using offset encoding: {s}", .{std.meta.tagName(offset_encoding)});
} }
var keep_running = true; var keep_running = true;
@ -1285,7 +1265,7 @@ fn shutdownHandler(arena: *std.heap.ArenaAllocator, id: types.RequestId, config:
_ = config; _ = config;
_ = arena; _ = arena;
logger.notice("Server closing...", .{}); logger.info("Server closing...", .{});
keep_running = false; keep_running = false;
// Technically we should deinitialize first and send possible errors to the client // Technically we should deinitialize first and send possible errors to the client
@ -1796,7 +1776,7 @@ pub fn main() anyerror!void {
// We know this is allocated with `allocator`, we just steal it! // We know this is allocated with `allocator`, we just steal it!
config.zig_lib_path = json_env.lib_dir.?; config.zig_lib_path = json_env.lib_dir.?;
json_env.lib_dir = null; json_env.lib_dir = null;
logger.notice("Using zig lib path '{s}'", .{config.zig_lib_path}); logger.info("Using zig lib path '{s}'", .{config.zig_lib_path});
} }
}, },
else => logger.alert("zig env invocation failed", .{}), else => logger.alert("zig env invocation failed", .{}),