From 5c87868d6d481b063a04eab5d6fb3b81764d908b Mon Sep 17 00:00:00 2001
From: Alec Larson <1925840+aleclarson@users.noreply.github.com>
Date: Wed, 9 Apr 2025 15:45:09 -0400
Subject: [PATCH] feat: print all logs to the vscode.OutputChannel

---
 src/extension.ts     | 7 ++++++-
 src/languageSetup.ts | 8 +++-----
 src/setupParams.ts   | 1 +
 src/util/logger.ts   | 8 +++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 6110f3a..21ca3d9 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -17,6 +17,10 @@ import { Status, StatusBarEntry } from './util/status';
 export async function activate(context: vscode.ExtensionContext): Promise<ExtensionApi> {
     configureLanguage();
 
+    const outputChannel = vscode.window.createOutputChannel("Kotlin");
+    LOG.appendLine = outputChannel.appendLine.bind(outputChannel);
+    context.subscriptions.push(outputChannel);
+
     const kotlinConfig = vscode.workspace.getConfiguration("kotlin");
     let langServerEnabled = kotlinConfig.get("languageServer.enabled");
     let debugAdapterEnabled = kotlinConfig.get("debugAdapter.enabled");
@@ -64,7 +68,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<Extens
         status,
         config: kotlinConfig,
         javaInstallation,
-        javaOpts
+        javaOpts,
+        outputChannel
     });
 
     let extensionApi = new ExtensionApi();
diff --git a/src/languageSetup.ts b/src/languageSetup.ts
index a2afbd3..20e7c45 100644
--- a/src/languageSetup.ts
+++ b/src/languageSetup.ts
@@ -1,4 +1,5 @@
 import * as child_process from "child_process";
+import * as util from "util";
 import * as fs from "fs";
 import * as net from "net";
 import * as path from "path";
@@ -15,8 +16,8 @@ import { RunDebugCodeLens } from "./runDebugCodeLens";
 import { MainClassRequest, OverrideMemberRequest } from "./lspExtensions";
 
 /** Downloads and starts the language server. */
-export async function activateLanguageServer({ context, status, config, javaInstallation, javaOpts }: ServerSetupParams): Promise<KotlinApi> {
-    LOG.info('Activating Kotlin Language Server...');
+export async function activateLanguageServer({ context, status, config, javaInstallation, javaOpts, outputChannel }: ServerSetupParams): Promise<KotlinApi> {
+    LOG.info('Activating Kotlin Language Server: {}', util.inspect({ javaInstallation, javaOpts }));
     status.update("Activating Kotlin Language Server...");
     
     // Prepare language server
@@ -35,9 +36,6 @@ export async function activateLanguageServer({ context, status, config, javaInst
         }
     }
 
-    const outputChannel = vscode.window.createOutputChannel("Kotlin");
-    context.subscriptions.push(outputChannel);
-    
     const transportLayer = config.get("languageServer.transport");
     let tcpPort: number = null;
     let env: any = { ...process.env };
diff --git a/src/setupParams.ts b/src/setupParams.ts
index 6099d5c..649eea9 100644
--- a/src/setupParams.ts
+++ b/src/setupParams.ts
@@ -8,4 +8,5 @@ export interface ServerSetupParams {
     config: vscode.WorkspaceConfiguration;
     javaInstallation: JavaInstallation;
     javaOpts: string;
+    outputChannel: vscode.OutputChannel;
 }
diff --git a/src/util/logger.ts b/src/util/logger.ts
index 7a0e0bf..e4ce295 100644
--- a/src/util/logger.ts
+++ b/src/util/logger.ts
@@ -10,9 +10,11 @@ export enum LogLevel {
 
 export class Logger {
     level: LogLevel;
+    appendLine: (line: string) => void;
     
-    public constructor(level: LogLevel) {
+    public constructor(level: LogLevel, appendLine: (line: string) => void) {
         this.level = level;
+        this.appendLine = appendLine;
     }
     
     private format(msg: String, placeholders: any[]): string {
@@ -36,7 +38,7 @@ export class Logger {
     
     private log(prefix: String, level: LogLevel, msg: String, placeholders: any[]): void {
         if (level >= this.level) {
-            console.log(prefix + this.format(msg, placeholders));
+            this.appendLine(prefix + this.format(msg, placeholders));
         }
     }
     
@@ -53,4 +55,4 @@ export class Logger {
     public deepTrace(msg: String, ...placeholders: any[]): void { this.log("Extension: [D_TRACE]", LogLevel.DEEP_TRACE, msg, placeholders); }
 }
 
-export const LOG = new Logger(LogLevel.INFO);
+export const LOG = new Logger(LogLevel.DEBUG, console.log);