From 9bb458bff2440e245a10f3b84ae94b6b125a07b0 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Wed, 24 Jan 2024 16:02:07 +0000
Subject: [PATCH] Clickable debug source paths and new launch target (#7335)

* Add rebuild launch target for daemon

* Change debug source path to be clickable in VS Code

* Shorten launch targets for readability in UI

* Update CL
---
 .vscode/launch.json  | 15 ++++++++++++---
 ChangeLog            |  1 +
 src/lib/base/Log.cpp |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 159f9702f..23b93fe1a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,19 +9,28 @@
       "preLaunchTask": "build"
     },
     {
-      "name": "windows daemon attach",
+      "name": "win daemon attach",
       "type": "cppvsdbg",
       "request": "attach",
       "processId": "${command:pickProcess}"
     },
     {
-      "name": "windows daemon attach lldb",
+      "name": "win daemon attach - lldb",
       "type": "lldb",
       "request": "attach",
       "program": "${workspaceFolder}/build/bin/synergyd"
     },
     {
-      "name": "windows daemon launch",
+      "name": "win daemon launch",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}/build/bin",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/bin/synergyd",
+      "args": ["-f"],
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "win daemon launch - rebuild",
       "type": "cppvsdbg",
       "cwd": "${workspaceRoot}/build/bin",
       "request": "launch",
diff --git a/ChangeLog b/ChangeLog
index d6bce5968..cd7bf62d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ Enhancements:
 - #7332 Static link OpenSSL libs in CMake preset for Windows
 - #7333 Update VS Code config for Windows daemon debugging
 - #7334 Implement hello back in IPC protocol
+- #7335 Clickable debug source paths and new launch target
 
 # 1.14.6
 
diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp
index 90f3431ea..7cec4cdde 100644
--- a/src/lib/base/Log.cpp
+++ b/src/lib/base/Log.cpp
@@ -203,7 +203,7 @@ Log::print(const char* file, int line, const char* fmt, ...)
         char* message = new char[size];
 
 #ifndef NDEBUG
-        snprintf(message, size, "[%s] %s: %s\n\t%s,%d", timestamp, g_priority[priority], buffer, file, line);
+        snprintf(message, size, "[%s] %s: %s\n\t%s:%d", timestamp, g_priority[priority], buffer, file, line);
 #else
         snprintf(message, size, "[%s] %s: %s", timestamp, g_priority[priority], buffer);
 #endif