1 files changed, 31 insertions, 3 deletions

diff --git a/Scripts/main.js b/Scripts/main.js
index 1058dfe..6f0a54e 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -12,6 +12,7 @@ const CONFIG_KEYS = {
   zlsEnabled: `${EXTENSION_ID}.zls.enabled`,
   zlsBuildOnSave: `${EXTENSION_ID}.zls.build-on-save`,
   zlsDebug: `${EXTENSION_ID}.zls.debug`,
+  lldbDapDebug: `${EXTENSION_ID}.debug-adapter.debug`,
 };
 
 let languageServer = null;
@@ -264,7 +265,7 @@ function lldbDapProxyPath() {
 }
 
 function debugAdapterLogPath() {
-  return "/tmp/zig-lldb-dap-proxy.log";
+  return nova.path.join(nova.extension.globalStoragePath, "lldb-dap-proxy.log");
 }
 
 function issueNormalizerScriptPath() {
@@ -475,6 +476,21 @@ class ZigLanguageServer {
       clientOptions
     );
 
+    client.onNotification("window/logMessage", ({ type, message }) => {
+      // type: 1=Error, 2=Warning, 3=Info, 4=Log
+      const enriched =
+        message === "ParseError"
+          ? "ParseError — ZLS could not fully parse the Zig source (normal while editing)"
+          : message;
+      if (type === 1) {
+        console.error(`[ZLS] ${enriched}`);
+      } else if (type === 2) {
+        console.warn(`[ZLS] ${enriched}`);
+      } else if (debugLogs) {
+        console.log(`[ZLS] ${enriched}`);
+      }
+    });
+
     this.clientStopDisposable = client.onDidStop((error) => {
       if (error) {
         console.error(`[${LANGUAGE_CLIENT_ID}] ${error.message}`);
@@ -806,12 +822,24 @@ class ZigTaskAssistant {
     const action = new TaskDebugAdapterAction("zig-lldb-dap");
     action.transport = "stdio";
     action.command = "/usr/bin/perl";
-    action.args = [lldbDapProxyPath(), lldbDapPath, debugAdapterLogPath()];
+    const debugLog = getBooleanConfigValue(CONFIG_KEYS.lldbDapDebug, false);
+    let logPath;
+    if (debugLog) {
+      try {
+        const p = debugAdapterLogPath();
+        const dir = nova.path.dirname(p);
+        if (!nova.fs.stat(dir)) nova.fs.mkdir(dir);
+        logPath = p;
+      } catch (_) {}
+    }
+    action.args = logPath
+      ? [lldbDapProxyPath(), lldbDapPath, logPath]
+      : [lldbDapProxyPath(), lldbDapPath];
     action.debugRequest = "launch";
     action.env = {
       DYLD_FRAMEWORK_PATH: lldbFrameworkPaths().join(":"),
       NOVA_ZIG_LLDB_DAP_PATH: lldbDapPath,
-      NOVA_ZIG_DEBUG_LOG: debugAdapterLogPath(),
+      ...(logPath ? { NOVA_ZIG_DEBUG_LOG: logPath } : {}),
     };
     action.debugArgs = {
       program: programPath,