Use minimal LogOutputChannel approach instead

Author: award999

lldb/tools/lldb-dap/package-lock.json

@@ -32,20 +32,17 @@
     "@types/vscode": "1.75.0",
     "@vscode/debugprotocol": "^1.68.0",
     "@vscode/vsce": "^3.2.2",
-    "esbuild": "^0.25.8",
     "prettier": "^3.4.2",
     "prettier-plugin-curly": "^0.3.1",
-    "typescript": "^5.7.3",
-    "winston": "^3.17.0",
-    "winston-transport": "^4.9.0"
+    "typescript": "^5.7.3"
   },
   "activationEvents": [
     "onDebug",
     "onUri"
   ],
   "main": "./out/extension",
   "scripts": {
-    "vscode:prepublish": "esbuild src-ts/extension.ts --bundle --platform=node --external:vscode --minify --outfile=out/extension.js",
+    "vscode:prepublish": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "format": "npx prettier './src-ts/' --write",
     "package": "vsce package --out ./out/lldb-dap.vsix",

lldb/tools/lldb-dap/package.json

@@ -5,7 +5,7 @@ import * as child_process from "child_process";
 import * as fs from "node:fs/promises";
 import { ConfigureButton, OpenSettingsButton } from "./ui/show-error-message";
 import { ErrorWithNotification } from "./ui/error-with-notification";
-import { LogFilePathProvider, Logger } from "./logger";
+import { LogFilePathProvider } from "./types";
 
 const exec = util.promisify(child_process.execFile);
 
@@ -177,15 +177,15 @@ function formatDate(date: Date): string {
  * Creates a new {@link vscode.DebugAdapterExecutable} based on the provided workspace folder and
  * debug configuration. Assumes that the given debug configuration is for a local launch of lldb-dap.
  *
- * @param logger The {@link Logger} to get default session log location
+ * @param logger The {@link vscode.LogOutputChannel} to log setup diagnostics
  * @param logFilePath The {@link LogFilePathProvider} for determining where to put session logs
  * @param workspaceFolder The {@link vscode.WorkspaceFolder} that the debug session will be launched within
  * @param configuration The {@link vscode.DebugConfiguration} that will be launched
  * @throws An {@link ErrorWithNotification} if something went wrong
  * @returns The {@link vscode.DebugAdapterExecutable} that can be used to launch lldb-dap
  */
 export async function createDebugAdapterExecutable(
-  logger: Logger,
+  logger: vscode.LogOutputChannel,
   logFilePath: LogFilePathProvider,
   workspaceFolder: vscode.WorkspaceFolder | undefined,
   configuration: vscode.DebugConfiguration,
@@ -233,7 +233,7 @@ export class LLDBDapDescriptorFactory
   implements vscode.DebugAdapterDescriptorFactory
 {
   constructor(
-    private readonly logger: Logger,
+    private readonly logger: vscode.LogOutputChannel,
     private logFilePath: LogFilePathProvider,
   ) {}
 
@@ -242,7 +242,7 @@ export class LLDBDapDescriptorFactory
     executable: vscode.DebugAdapterExecutable | undefined,
   ): Promise<vscode.DebugAdapterDescriptor | undefined> {
     this.logger.info(`Creating debug adapter for session "${session.name}"`);
-    this.logger.debug(
+    this.logger.info(
       `Session "${session.name}" debug configuration:\n` +
         JSON.stringify(session.configuration, undefined, 2),
     );

lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts

@@ -5,7 +5,7 @@ import { LLDBDapServer } from "./lldb-dap-server";
 import { createDebugAdapterExecutable } from "./debug-adapter-factory";
 import { ConfigureButton, showErrorMessage } from "./ui/show-error-message";
 import { ErrorWithNotification } from "./ui/error-with-notification";
-import { LogFilePathProvider, Logger } from "./logger";
+import { LogFilePathProvider } from "./types";
 
 const exec = util.promisify(child_process.execFile);
 
@@ -74,7 +74,7 @@ export class LLDBDapConfigurationProvider
 {
   constructor(
     private readonly server: LLDBDapServer,
-    private readonly logger: Logger,
+    private readonly logger: vscode.LogOutputChannel,
     private readonly logFilePath: LogFilePathProvider,
   ) {}
 
@@ -198,7 +198,7 @@ export class LLDBDapConfigurationProvider
         }
       }
 
-      this.logger.debug(
+      this.logger.info(
         "Resolved debug configuration:\n" +
           JSON.stringify(debugConfiguration, undefined, 2),
       );

lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts

@@ -1,6 +1,5 @@
 import { DebugProtocol } from "@vscode/debugprotocol";
 import * as vscode from "vscode";
-import { Logger } from "./logger";
 
 /** A helper type for mapping event types to their corresponding data type. */
 // prettier-ignore
@@ -49,7 +48,7 @@ export class DebugSessionTracker
   onDidChangeModules: vscode.Event<vscode.DebugSession | undefined> =
     this.modulesChanged.event;
 
-  constructor(private logger: Logger) {
+  constructor(private logger: vscode.LogOutputChannel) {
     this.onDidChangeModules(this.moduleChangedListener, this);
     vscode.debug.onDidChangeActiveDebugSession((session) =>
       this.modulesChanged.fire(session),

lldb/tools/lldb-dap/src-ts/debug-session-tracker.ts

@@ -11,15 +11,15 @@ import {
   ModulesDataProvider,
   ModuleProperty,
 } from "./ui/modules-data-provider";
-import { LLDBDAPLogger, LogFilePathProvider } from "./logger";
+import { LogFilePathProvider } from "./types";
 
 /**
  * This class represents the extension and manages its life cycle. Other extensions
  * using it as as library should use this class as the main entry point.
  */
 export class LLDBDapExtension extends DisposableContext {
   constructor(
-    logger: LLDBDAPLogger,
+    logger: vscode.LogOutputChannel,
     logFilePath: LogFilePathProvider,
     outputChannel: vscode.OutputChannel,
   ) {
@@ -63,17 +63,12 @@ export class LLDBDapExtension extends DisposableContext {
  * This is the entry point when initialized by VS Code.
  */
 export async function activate(context: vscode.ExtensionContext) {
-  await vscode.workspace.fs.createDirectory(context.logUri);
-  const outputChannel = vscode.window.createOutputChannel("LLDB-DAP");
-  const logFilePath: LogFilePathProvider = (name) =>
+  const outputChannel = vscode.window.createOutputChannel("LLDB-DAP", { log: true });
+  const logFilePath: LogFilePathProvider = (name: string) =>
     path.join(context.logUri.fsPath, name);
-  const logger = new LLDBDAPLogger(
-    logFilePath("lldb-dap-extension.log"),
-    outputChannel,
-  );
-  logger.info("LLDB-Dap extension activating...");
+  outputChannel.info("LLDB-Dap extension activating...");
   context.subscriptions.push(
-    new LLDBDapExtension(logger, logFilePath, outputChannel),
+    new LLDBDapExtension(outputChannel, logFilePath, outputChannel),
   );
-  logger.info("LLDB-Dap extension activated");
+  outputChannel.info("LLDB-Dap extension activated");
 }

lldb/tools/lldb-dap/src-ts/extension.ts

@@ -0,0 +1 @@
+export type LogFilePathProvider = (name: string) => string;