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

improve width of log prefix (#649)

Browse Source
This commit is contained in:
Techatrix 2022-09-13 20:12:32 +00:00 committed by GitHub
parent 6363e7a064
commit e6238e3354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/DocumentStore.zig
View File

@ -3,7 +3,7 @@ const types = @import("types.zig");
const URI = @import("uri.zig"); const URI = @import("uri.zig");
const analysis = @import("analysis.zig"); const analysis = @import("analysis.zig");
const offsets = @import("offsets.zig"); const offsets = @import("offsets.zig");
const log = std.log.scoped(.doc_store); const log = std.log.scoped(.store);
const Ast = std.zig.Ast; const Ast = std.zig.Ast;
const BuildAssociatedConfig = @import("BuildAssociatedConfig.zig"); const BuildAssociatedConfig = @import("BuildAssociatedConfig.zig");
const BuildConfig = @import("special/build_runner.zig").BuildConfig; const BuildConfig = @import("special/build_runner.zig").BuildConfig;
@ -267,11 +267,17 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
const tracy_zone = tracy.trace(@src()); const tracy_zone = tracy.trace(@src());
defer tracy_zone.end(); defer tracy_zone.end();
log.debug("Opened document: {s}", .{uri});
var handle = try self.allocator.create(Handle); var handle = try self.allocator.create(Handle);
errdefer self.allocator.destroy(handle); errdefer self.allocator.destroy(handle);
defer {
if (handle.associated_build_file) |build_file| {
log.debug("Opened document `{s}` with build file `{s}`", .{ handle.uri(), build_file.uri });
} else {
log.debug("Opened document `{s}` without a build file", .{ handle.uri() });
}
}
var tree = try std.zig.parse(self.allocator, text); var tree = try std.zig.parse(self.allocator, text);
errdefer tree.deinit(self.allocator); errdefer tree.deinit(self.allocator);
@ -355,9 +361,6 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
candidate = build_file; candidate = build_file;
} }
} }
if (candidate) |build_file| {
log.debug("Found a candidate associated build file: `{s}`", .{build_file.uri});
}
} }
// Then, try to find the closest build file. // Then, try to find the closest build file.
@ -423,7 +426,6 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
if (candidate) |build_file| { if (candidate) |build_file| {
build_file.refs += 1; build_file.refs += 1;
handle.associated_build_file = build_file; handle.associated_build_file = build_file;
log.debug("Associated build file `{s}` to document `{s}`", .{ build_file.uri, handle.uri() });
} }
} }
@ -449,12 +451,11 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
pub fn openDocument(self: *DocumentStore, uri: []const u8, text: []const u8) !*Handle { pub fn openDocument(self: *DocumentStore, uri: []const u8, text: []const u8) !*Handle {
if (self.handles.getEntry(uri)) |entry| { if (self.handles.getEntry(uri)) |entry| {
log.debug("Document already open: {s}, incrementing count", .{uri});
entry.value_ptr.*.count += 1; entry.value_ptr.*.count += 1;
log.debug("Document already open: {s}, new count: {}", .{ uri, entry.value_ptr.*.count });
if (entry.value_ptr.*.is_build_file) |build_file| { if (entry.value_ptr.*.is_build_file) |build_file| {
build_file.refs += 1; build_file.refs += 1;
} }
log.debug("New count: {}", .{entry.value_ptr.*.count});
return entry.value_ptr.*; return entry.value_ptr.*;
} }

1
src/Server.zig
View File

@ -1843,7 +1843,6 @@ fn requestConfiguration(server: *Server, writer: anytype) !void {
break :confi comp_confi; break :confi comp_confi;
}; };
log.info("Requesting configuration!", .{});
try send(writer, server.arena.allocator(), types.Request{ try send(writer, server.arena.allocator(), types.Request{
.id = .{ .String = "i_haz_configuration" }, .id = .{ .String = "i_haz_configuration" },
.method = "workspace/configuration", .method = "workspace/configuration",

5
src/main.zig
View File

@ -28,8 +28,9 @@ pub fn log(
if (@enumToInt(level) > @enumToInt(actual_log_level)) return; if (@enumToInt(level) > @enumToInt(actual_log_level)) return;
const level_txt = comptime level.asText(); const level_txt = comptime level.asText();
const prefix2 = if (scope == .default) ": " else "(" ++ @tagName(scope) ++ "): ";
std.debug.print(level_txt ++ prefix2 ++ format ++ "\n", args); std.debug.print("{s:<5}: ({s:^6}): ", .{ level_txt, @tagName(scope) });
std.debug.print(format ++ "\n", args);
} }
fn loop(server: *Server) !void { fn loop(server: *Server) !void {

1
src/semantic_tokens.zig
View File

@ -3,7 +3,6 @@ const offsets = @import("offsets.zig");
const DocumentStore = @import("DocumentStore.zig"); const DocumentStore = @import("DocumentStore.zig");
const analysis = @import("analysis.zig"); const analysis = @import("analysis.zig");
const Ast = std.zig.Ast; const Ast = std.zig.Ast;
const log = std.log.scoped(.semantic_tokens);
const ast = @import("ast.zig"); const ast = @import("ast.zig");
pub const TokenType = enum(u32) { pub const TokenType = enum(u32) {