Remove popupMessageEvent and use CustomRequestEvent with popup messages as the event

Author: Christian-Holbrook

src/LogOutputManager.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { isChanperfEvent, isLaunchStartEvent, isLogOutputEvent, isPopupMessageEvent, isRendezvousEvent } from 'roku-debug';
+import { isChanperfEvent, isLaunchStartEvent, isLogOutputEvent, isRendezvousEvent } from 'roku-debug';
 import type { DeclarationProvider } from './DeclarationProvider';
 import type { LogDocumentLinkProvider } from './LogDocumentLinkProvider';
 import { CustomDocumentLink } from './LogDocumentLinkProvider';
@@ -228,9 +228,6 @@ export class LogOutputManager {
             }
             this.appendLine(e.body.line);
 
-        } else if (isPopupMessageEvent(e)) {
-            this.showMessage(e.body.message, e.body.severity, e.body.modal);
-
         } else if (isLaunchStartEvent(e)) {
             this.isInMicroDebugger = false;
             this.isNextBreakpointSkipped = false;
@@ -245,15 +242,6 @@ export class LogOutputManager {
         }
     }
 
-    private showMessage(message: string, severity: string, modal: boolean) {
-        const methods = {
-            error: vscode.window.showErrorMessage,
-            info: vscode.window.showInformationMessage,
-            warn: vscode.window.showWarningMessage
-        };
-        methods[severity](message, { modal: modal });
-    }
-
     /**
      * Log output methods
      */

src/extension.ts

@@ -23,7 +23,7 @@ import { TelemetryManager } from './managers/TelemetryManager';
 import { RemoteControlManager } from './managers/RemoteControlManager';
 import { WhatsNewManager } from './managers/WhatsNewManager';
 import type { CustomRequestEvent } from 'roku-debug';
-import { isChannelPublishedEvent, isChanperfEvent, isDiagnosticsEvent, isDebugServerLogOutputEvent, isLaunchStartEvent, isRendezvousEvent, isCustomRequestEvent, isExecuteTaskCustomRequest, ClientToServerCustomEventName } from 'roku-debug';
+import { isChannelPublishedEvent, isChanperfEvent, isDiagnosticsEvent, isDebugServerLogOutputEvent, isLaunchStartEvent, isRendezvousEvent, isCustomRequestEvent, isExecuteTaskCustomRequest, ClientToServerCustomEventName, isShowPopupMessageCustomRequest } from 'roku-debug';
 import { RtaManager } from './managers/RtaManager';
 import { WebviewViewProviderManager } from './managers/WebviewViewProviderManager';
 import { ViewProviderId } from './viewProviders/ViewProviderId';
@@ -204,10 +204,6 @@ export class Extension {
             this.diagnosticManager.clear();
         });
 
-        vscode.debug.onDidReceiveDebugSessionCustomEvent(async (e) => {
-            await logOutputManager.onDidReceiveDebugSessionCustomEvent(e);
-        });
-
         let brightscriptConfig = vscode.workspace.getConfiguration('brightscript');
         if (brightscriptConfig?.outputPanelStartupBehavior) {
             if (brightscriptConfig.outputPanelStartupBehavior === 'show') {
@@ -232,6 +228,7 @@ export class Extension {
     }
 
     private async debugSessionCustomEventHandler(e: vscode.DebugSessionCustomEvent, context: vscode.ExtensionContext, docLinkProvider: LogDocumentLinkProvider, logOutputManager: LogOutputManager, rendezvousViewProvider: RendezvousViewProvider) {
+
         if (isLaunchStartEvent(e)) {
             const config = e.body as BrightScriptLaunchConfiguration;
             await docLinkProvider.setLaunchConfig(config);
@@ -287,19 +284,40 @@ export class Extension {
                 }
             }
         }
+
+        try {
+            await logOutputManager.onDidReceiveDebugSessionCustomEvent(e);
+        } catch (err) {
+            console.error('Error handling custom event', e, err);
+        }
+    }
+
+    private async showMessage(e: any) {
+        const methods = {
+            error: vscode.window.showErrorMessage,
+            info: vscode.window.showInformationMessage,
+            warn: vscode.window.showWarningMessage
+        };
+        return {
+            selectedAction: await Promise.resolve(methods[e.body.severity](e.body.message, { modal: e.body.modal }, ...e.body.actions))
+        };
     }
 
     private async processCustomRequestEvent(event: CustomRequestEvent, session: vscode.DebugSession) {
         try {
             let response: any;
             if (isExecuteTaskCustomRequest(event)) {
                 response = await this.executeTask(event.body.task);
+            } else if (isShowPopupMessageCustomRequest(event)) {
+                response = await this.showMessage(event);
             }
+            //send the response back to the server
             await session.customRequest(ClientToServerCustomEventName.customRequestEventResponse, {
                 requestId: event.body.requestId,
                 ...response ?? {}
             });
         } catch (e) {
+            //send the error back to the server
             await session.customRequest(ClientToServerCustomEventName.customRequestEventResponse, {
                 requestId: e.body.requestId,
                 error: {