Adjusting the modules tree view name and adding some documentation to…

… help explain the code a bit.

lldb/tools/lldb-dap/package.json

@@ -768,8 +768,8 @@
     "views": {
       "debug": [
         {
-          "id": "lldb-dap.modulesExplorer",
-          "name": "LLDB Modules Explorer",
+          "id": "lldb-dap.modules",
+          "name": "Modules",
           "when": "inDebugMode && debugType == 'lldb-dap'",
           "icon": "$(symbol-module)"
         }

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

@@ -1,10 +1,13 @@
 import { DebugProtocol } from "@vscode/debugprotocol";
 import * as vscode from "vscode";
 
+/** A helper type for mapping event types to their corresponding data type. */
+// prettier-ignore
 interface EventMap {
-  module: DebugProtocol.ModuleEvent;
+  "module": DebugProtocol.ModuleEvent;
 }
 
+/** A type assertion to check if a ProtocolMessage is an event or if it is a specific event. */
 function isEvent(
   message: DebugProtocol.ProtocolMessage,
 ): message is DebugProtocol.Event;
@@ -22,11 +25,23 @@ function isEvent(
   );
 }
 
+/** Tracks lldb-dap sessions for data visualizers. */
 export class DebugSessionTracker
   implements vscode.DebugAdapterTrackerFactory, vscode.Disposable
 {
+  /**
+   * Tracks active modules for each debug sessions.
+   *
+   * The modules are kept in an array to maintain the load order of the modules.
+   */
   private modules = new Map<vscode.DebugSession, DebugProtocol.Module[]>();
   private modulesChanged = new vscode.EventEmitter<void>();
+
+  /**
+   * Fired when modules are changed for any active debug session.
+   *
+   * Use `debugSessionModules` to retieve the active modules for a given debug session.
+   */
   onDidChangeModules: vscode.Event<void> = this.modulesChanged.event;
 
   dispose() {
@@ -43,12 +58,19 @@ export class DebugSessionTracker
     };
   }
 
+  /**
+   * Retrieves the modules for the given debug session.
+   *
+   * Modules are returned in load order.
+   */
   debugSessionModules(session: vscode.DebugSession): DebugProtocol.Module[] {
     return this.modules.get(session) ?? [];
   }
 
+  /** Clear information from the active session. */
   private onExit(session: vscode.DebugSession) {
     this.modules.delete(session);
+    this.modulesChanged.fire();
   }
 
   private onDidSendMessage(

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

@@ -6,7 +6,7 @@ import { LaunchUriHandler } from "./uri-launch-handler";
 import { LLDBDapConfigurationProvider } from "./debug-configuration-provider";
 import { LLDBDapServer } from "./lldb-dap-server";
 import { DebugSessionTracker } from "./debug-session-tracker";
-import { ModuleDataProvider } from "./ui/modules-data-provider";
+import { ModulesDataProvider } from "./ui/modules-data-provider";
 
 /**
  * This class represents the extension and manages its life cycle. Other extensions
@@ -17,39 +17,27 @@ export class LLDBDapExtension extends DisposableContext {
     super();
 
     const lldbDapServer = new LLDBDapServer();
-    this.pushSubscription(lldbDapServer);
+    const sessionTracker = new DebugSessionTracker();
 
     this.pushSubscription(
+      lldbDapServer,
+      sessionTracker,
       vscode.debug.registerDebugConfigurationProvider(
         "lldb-dap",
         new LLDBDapConfigurationProvider(lldbDapServer),
       ),
-    );
-
-    this.pushSubscription(
       vscode.debug.registerDebugAdapterDescriptorFactory(
         "lldb-dap",
         new LLDBDapDescriptorFactory(),
       ),
-    );
-
-    const sessionTracker = new DebugSessionTracker();
-
-    this.pushSubscription(
       vscode.debug.registerDebugAdapterTrackerFactory(
         "lldb-dap",
         sessionTracker,
       ),
-    );
-
-    this.pushSubscription(
       vscode.window.registerTreeDataProvider(
-        "lldb-dap.modulesExplorer",
-        new ModuleDataProvider(sessionTracker),
+        "lldb-dap.modules",
+        new ModulesDataProvider(sessionTracker),
       ),
-    );
-
-    this.pushSubscription(
       vscode.window.registerUriHandler(new LaunchUriHandler()),
     );
   }

lldb/tools/lldb-dap/src-ts/ui/modules-data-provider.ts

@@ -2,7 +2,8 @@ import * as vscode from "vscode";
 import { DebugProtocol } from "@vscode/debugprotocol";
 import { DebugSessionTracker } from "../debug-session-tracker";
 
-export class ModuleDataProvider
+/** A tree data provider for listing loaded modules for the active debug session. */
+export class ModulesDataProvider
   implements vscode.TreeDataProvider<DebugProtocol.Module>
 {
   private changeTreeData = new vscode.EventEmitter<void>();