Guard -WaitForDebugger flag client-side too

andyleejordan · andyleejordan · commit 9ca25605655a · 2022-11-02T11:55:18.000-07:00
diff --git a/src/session.ts b/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 ";
         }
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ export class SessionManager implements Middleware {`
`331`	`331`	`// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition`
`332`	`332`	`if ((resolvedCodeLens as Thenable<vscode.CodeLens>).then) {`
`333`	`333`	`return (resolvedCodeLens as Thenable<vscode.CodeLens>).then(resolveFunc);`
`334`		`-// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition`
	`334`	`+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition`
`335`	`335`	`} else if (resolvedCodeLens as vscode.CodeLens) {`
`336`	`336`	`return resolveFunc(resolvedCodeLens as vscode.CodeLens);`
`337`	`337`	`}`
`@@ -571,7 +571,9 @@ Type 'help' to get help.`
`571`	`571`	editorServicesArgs += `-StartupBanner "${startupBanner}" `;
`572`	`572`	`}`
`573`	`573`
`574`		`-if (this.sessionSettings.developer.editorServicesWaitForDebugger) {`
	`574`	`+// We guard this here too out of an abundance of precaution.`
	`575`	`+if (this.sessionSettings.developer.editorServicesWaitForDebugger`
	`576`	`+&& this.extensionContext.extensionMode === vscode.ExtensionMode.Development) {`
`575`	`577`	`editorServicesArgs += "-WaitForDebugger ";`
`576`	`578`	`}`
`577`	`579`