remoteControlMode type change

rokucommunity · Sep 28, 2023 · e32e45c · e32e45c
1 parent fa8c8dd
commit e32e45c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/DebugConfigurationProvider.spec.ts b/src/DebugConfigurationProvider.spec.ts
@@ -149,7 +149,7 @@ describe('BrightScriptConfigurationProvider', () => {
                         s`${folder.uri.fsPath}/out/`
                     );
                 } else {
-                    expect(config[key], `Expected "${key}" to match the default`).to.equal(configDefaults[key]);
+                    expect(config[key], `Expected "${key}" to match the default`).to.deep.equal(configDefaults[key]);
                 }
             }
         });

diff --git a/src/DebugConfigurationProvider.ts b/src/DebugConfigurationProvider.ts
@@ -247,8 +247,17 @@ export class BrightScriptDebugConfigurationProvider implements DebugConfiguratio
         config.cwd = folderUri.fsPath;
         config.rendezvousTracking = config.rendezvousTracking === false ? false : true;
         config.deleteDevChannelBeforeInstall = config.deleteDevChannelBeforeInstall === true;
-        config.remoteControlMode = config.remoteControlMode ? config.remoteControlMode : this.configDefaults.remoteControlMode;
-        config.remoteControlMode = config.remoteControlMode === true ? { activateOnSessionStart: true, deactivateOnSessionEnd: true } : config.remoteControlMode;
+        if (typeof config.remoteControlMode === 'boolean') {
+            config.remoteControlMode = {
+                activateOnSessionStart: config.remoteControlMode,
+                deactivateOnSessionEnd: config.remoteControlMode
+            };
+        } else {
+            config.remoteControlMode = {
+                activateOnSessionStart: config.remoteControlMode?.activateOnSessionStart ?? this.configDefaults.remoteControlMode.activateOnSessionStart,
+                deactivateOnSessionEnd: config.remoteControlMode?.deactivateOnSessionEnd ?? this.configDefaults.remoteControlMode.deactivateOnSessionEnd
+            };
+        }
 
         if (config.request !== 'launch') {
             await vscode.window.showErrorMessage(`roku-debug only supports the 'launch' request type`);
@@ -572,5 +581,5 @@ export interface BrightScriptLaunchConfiguration extends LaunchConfiguration {
      * If true, the remote control will be enabled at the start of the debug session, and disabled at the end of the debug session.
      * @default false
      */
-    remoteControlMode?: boolean | { activateOnSessionStart?: boolean; deactivateOnSessionEnd?: boolean };
+    remoteControlMode?: { activateOnSessionStart?: boolean; deactivateOnSessionEnd?: boolean };
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -178,7 +178,7 @@ export class Extension {
             if (e.type === 'brightscript') {
                 this.chanperfStatusBar.hide();
                 const config = e.configuration as BrightScriptLaunchConfiguration;
-                if (config.remoteControlMode && (config.remoteControlMode === true || config.remoteControlMode?.deactivateOnSessionEnd === true)) {
+                if (config.remoteControlMode?.deactivateOnSessionEnd) {
                     void this.remoteControlManager.setRemoteControlMode(false, 'launch');
                 }
             }
@@ -216,7 +216,7 @@ export class Extension {
             const config = e.body as BrightScriptLaunchConfiguration;
             await docLinkProvider.setLaunchConfig(config);
             logOutputManager.setLaunchConfig(config);
-            if (config.remoteControlMode && (config.remoteControlMode === true || config.remoteControlMode?.activateOnSessionStart === true)) {
+            if (config.remoteControlMode?.activateOnSessionStart) {
                 void this.remoteControlManager.setRemoteControlMode(true, 'launch');
             }
         } else if (isChannelPublishedEvent(e)) {