Guard -WaitForDebugger flag client-side too

Author: andyleejordan

src/session.ts

@@ -331,7 +331,7 @@ export class SessionManager implements Middleware {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if ((resolvedCodeLens as Thenable<vscode.CodeLens>).then) {
             return (resolvedCodeLens as Thenable<vscode.CodeLens>).then(resolveFunc);
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         } else if (resolvedCodeLens as vscode.CodeLens) {
             return resolveFunc(resolvedCodeLens as vscode.CodeLens);
         }
@@ -571,7 +571,9 @@ Type 'help' to get help.
             editorServicesArgs += `-StartupBanner "${startupBanner}" `;
         }
 
-        if (this.sessionSettings.developer.editorServicesWaitForDebugger) {
+        // We guard this here too out of an abundance of precaution.
+        if (this.sessionSettings.developer.editorServicesWaitForDebugger
+            && this.extensionContext.extensionMode === vscode.ExtensionMode.Development) {
             editorServicesArgs += "-WaitForDebugger ";
         }
 
@@ -765,25 +767,25 @@ Type 'help' to get help.
         }
 
         switch (status) {
-        case SessionStatus.Running:
-        case SessionStatus.NeverStarted:
-        case SessionStatus.NotStarted:
-            this.languageStatusItem.busy = false;
-            this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Information;
-            break;
-        case SessionStatus.Busy:
-            this.languageStatusItem.busy = true;
-            this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Information;
-            break;
-        case SessionStatus.Initializing:
-        case SessionStatus.Stopping:
-            this.languageStatusItem.busy = true;
-            this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Warning;
-            break;
-        case SessionStatus.Failed:
-            this.languageStatusItem.busy = false;
-            this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Error;
-            break;
+            case SessionStatus.Running:
+            case SessionStatus.NeverStarted:
+            case SessionStatus.NotStarted:
+                this.languageStatusItem.busy = false;
+                this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Information;
+                break;
+            case SessionStatus.Busy:
+                this.languageStatusItem.busy = true;
+                this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Information;
+                break;
+            case SessionStatus.Initializing:
+            case SessionStatus.Stopping:
+                this.languageStatusItem.busy = true;
+                this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Warning;
+                break;
+            case SessionStatus.Failed:
+                this.languageStatusItem.busy = false;
+                this.languageStatusItem.severity = vscode.LanguageStatusSeverity.Error;
+                break;
         }
 
     }
@@ -839,35 +841,35 @@ Type 'help' to get help.
         let sessionText: string;
 
         switch (this.sessionStatus) {
-        case SessionStatus.Running:
-        case SessionStatus.Initializing:
-        case SessionStatus.NotStarted:
-        case SessionStatus.NeverStarted:
-        case SessionStatus.Stopping:
-            if (this.PowerShellExeDetails && this.versionDetails) {
-                const currentPowerShellExe =
+            case SessionStatus.Running:
+            case SessionStatus.Initializing:
+            case SessionStatus.NotStarted:
+            case SessionStatus.NeverStarted:
+            case SessionStatus.Stopping:
+                if (this.PowerShellExeDetails && this.versionDetails) {
+                    const currentPowerShellExe =
                         availablePowerShellExes
                             .find((item) => item.displayName.toLowerCase() === this.PowerShellExeDetails!.displayName.toLowerCase());
 
-                const powerShellSessionName =
+                    const powerShellSessionName =
                         currentPowerShellExe ?
                             currentPowerShellExe.displayName :
                             `PowerShell ${this.versionDetails.displayVersion} ` +
                             `(${this.versionDetails.architecture}) ${this.versionDetails.edition} Edition ` +
                             `[${this.versionDetails.version}]`;
 
-                sessionText = `Current session: ${powerShellSessionName}`;
-            } else {
-                sessionText = "Current session: Unknown";
-            }
-            break;
+                    sessionText = `Current session: ${powerShellSessionName}`;
+                } else {
+                    sessionText = "Current session: Unknown";
+                }
+                break;
 
-        case SessionStatus.Failed:
-            sessionText = "Session initialization failed, click here to show PowerShell extension logs";
-            break;
+            case SessionStatus.Failed:
+                sessionText = "Session initialization failed, click here to show PowerShell extension logs";
+                break;
 
-        default:
-            throw new TypeError("Not a valid value for the enum 'SessionStatus'");
+            default:
+                throw new TypeError("Not a valid value for the enum 'SessionStatus'");
         }
 
         const powerShellItems =