From e6238e3354e43fdecf90324e80197ab3c74b7128 Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Tue, 13 Sep 2022 20:12:32 +0000
Subject: [PATCH] improve width of log prefix (#649)

---
 src/DocumentStore.zig   | 19 ++++++++++---------
 src/Server.zig          |  1 -
 src/main.zig            |  5 +++--
 src/semantic_tokens.zig |  1 -
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/DocumentStore.zig b/src/DocumentStore.zig
index 47235d0..4e8cd78 100644
--- a/src/DocumentStore.zig
+++ b/src/DocumentStore.zig
@@ -3,7 +3,7 @@ const types = @import("types.zig");
 const URI = @import("uri.zig");
 const analysis = @import("analysis.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 BuildAssociatedConfig = @import("BuildAssociatedConfig.zig");
 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());
     defer tracy_zone.end();
 
-    log.debug("Opened document: {s}", .{uri});
-
     var handle = try self.allocator.create(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);
     errdefer tree.deinit(self.allocator);
 
@@ -355,9 +361,6 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
                     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.
@@ -423,7 +426,6 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: [:0]u8) anyerror!*Ha
         if (candidate) |build_file| {
             build_file.refs += 1;
             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 {
     if (self.handles.getEntry(uri)) |entry| {
-        log.debug("Document already open: {s}, incrementing count", .{uri});
         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| {
             build_file.refs += 1;
         }
-        log.debug("New count: {}", .{entry.value_ptr.*.count});
         return entry.value_ptr.*;
     }
 
diff --git a/src/Server.zig b/src/Server.zig
index e21e8af..4241dd3 100644
--- a/src/Server.zig
+++ b/src/Server.zig
@@ -1843,7 +1843,6 @@ fn requestConfiguration(server: *Server, writer: anytype) !void {
         break :confi comp_confi;
     };
 
-    log.info("Requesting configuration!", .{});
     try send(writer, server.arena.allocator(), types.Request{
         .id = .{ .String = "i_haz_configuration" },
         .method = "workspace/configuration",
diff --git a/src/main.zig b/src/main.zig
index 44c8f68..e9f6f2d 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -28,8 +28,9 @@ pub fn log(
     if (@enumToInt(level) > @enumToInt(actual_log_level)) return;
 
     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 {
diff --git a/src/semantic_tokens.zig b/src/semantic_tokens.zig
index 90a48ac..fbca3fd 100644
--- a/src/semantic_tokens.zig
+++ b/src/semantic_tokens.zig
@@ -3,7 +3,6 @@ const offsets = @import("offsets.zig");
 const DocumentStore = @import("DocumentStore.zig");
 const analysis = @import("analysis.zig");
 const Ast = std.zig.Ast;
-const log = std.log.scoped(.semantic_tokens);
 const ast = @import("ast.zig");
 
 pub const TokenType = enum(u32) {