Merge remote-tracking branch 'upstream/main'

Author: fdncred

client/src/extension.ts

@@ -12,11 +12,12 @@ import {
   LanguageClient,
   LanguageClientOptions,
   ServerOptions,
+  Trace,
 } from 'vscode-languageclient/node';
-import { time } from 'console';
 
 let client: LanguageClient;
-let outputChannel: OutputChannel;
+let outputChannel: OutputChannel; // Trace channel
+let serverOutputChannel: OutputChannel; // Server logs channel (single instance)
 
 function findNushellExecutable(): string | null {
   try {
@@ -50,7 +51,23 @@ function startLanguageServer(
   context: vscode.ExtensionContext,
   found_nushell_path: string,
 ): void {
-  outputChannel = window.createOutputChannel('Nushell LSP Output', 'log');
+  // Prevent duplicate clients/channels
+  if (client) {
+    vscode.window.showInformationMessage(
+      'Nushell Language Server is already running.',
+    );
+    return;
+  }
+  // Channel to receive detailed JSON-RPC trace between VS Code and the LSP server
+  if (outputChannel) {
+    try {
+      outputChannel.dispose();
+    } catch {
+      // ignore
+    }
+  }
+  outputChannel = window.createOutputChannel('Nushell LSP Trace');
+  context.subscriptions.push(outputChannel);
 
   // Use Nushell's native LSP server
   const serverOptions: ServerOptions = {
@@ -64,9 +81,18 @@ function startLanguageServer(
     },
   };
 
+  // Ensure a single server output channel exists and is reused
+  if (!serverOutputChannel) {
+    serverOutputChannel = window.createOutputChannel('Nushell Language Server');
+    context.subscriptions.push(serverOutputChannel);
+  }
+
   // Options to control the language client
   const clientOptions: LanguageClientOptions = {
-    outputChannelName: 'Nushell Language Server',
+    // Route general server logs to a single, reusable channel
+    outputChannel: serverOutputChannel,
+    // Send JSON-RPC trace to a dedicated channel visible in the Output panel
+    traceOutputChannel: outputChannel,
     markdown: {
       isTrusted: true,
       supportHtml: true,
@@ -90,6 +116,43 @@ function startLanguageServer(
     clientOptions,
   );
 
+  // Initialize trace level from settings and react to changes
+  const applyTraceFromConfig = () => {
+    const configured = vscode.workspace
+      .getConfiguration('nushellLanguageServer')
+      .get<'off' | 'messages' | 'verbose'>('trace.server');
+    const level: 'off' | 'messages' | 'verbose' = configured ?? 'messages';
+    const map: Record<'off' | 'messages' | 'verbose', Trace> = {
+      off: Trace.Off,
+      messages: Trace.Messages,
+      verbose: Trace.Verbose,
+    };
+    client.setTrace(map[level]);
+    try {
+      outputChannel.appendLine(`[Nushell] JSON-RPC tracing set to: ${level}`);
+      if (level !== 'off') {
+        outputChannel.show(true);
+      }
+    } catch {
+      // ignore
+    }
+  };
+  applyTraceFromConfig();
+  const cfgDisp = vscode.workspace.onDidChangeConfiguration((e) => {
+    if (e.affectsConfiguration('nushellLanguageServer.trace.server')) {
+      applyTraceFromConfig();
+    }
+  });
+  context.subscriptions.push(cfgDisp);
+  // Log client lifecycle
+  client.onDidChangeState((e) => {
+    try {
+      outputChannel.appendLine(`[Nushell] Client state changed: ${e.newState}`);
+    } catch {
+      // ignore
+    }
+  });
+
   // Start the language client and register a disposable that stops it when disposed
   client.start().catch((error) => {
     vscode.window.showErrorMessage(
@@ -177,7 +240,6 @@ export function activate(context: vscode.ExtensionContext) {
     return;
   }
 
-  context.subscriptions.push(outputChannel);
   console.log(`Found nushell executable at: ${found_nushell_path}`);
   console.log('Activating Nushell Language Server extension.');
 

package-lock.json

@@ -109,7 +109,7 @@
             "messages",
             "verbose"
           ],
-          "default": "off",
+          "default": "messages",
           "description": "Traces the communication between VS Code and the language server."
         },
         "nushellLanguageServer.hints.showInferredTypes": {