diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts index f90de4190ad..b4e206a3e30 100644 --- a/src/vs/platform/environment/common/argv.ts +++ b/src/vs/platform/environment/common/argv.ts @@ -118,7 +118,6 @@ export interface NativeParsedArgs { 'file-write'?: boolean; 'file-chmod'?: boolean; 'enable-smoke-test-driver'?: boolean; - 'allow-dialogs-while-driven'?: boolean; 'remote'?: string; 'force'?: boolean; 'do-not-sync'?: boolean; diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index cb6250d2c3e..a8d76158a73 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -163,7 +163,6 @@ export const OPTIONS: OptionDescriptions> = { 'export-default-configuration': { type: 'string' }, 'install-source': { type: 'string' }, 'enable-smoke-test-driver': { type: 'boolean' }, - 'allow-dialogs-while-driven': { type: 'boolean' }, 'logExtensionHostCommunication': { type: 'boolean' }, 'skip-release-notes': { type: 'boolean' }, 'skip-welcome': { type: 'boolean' }, diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts index ae17bca6376..0535ddd998f 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -43,7 +43,6 @@ const isSupportedForCmd = (optionId: keyof RemoteParsedArgs) => { case 'export-default-configuration': case 'install-source': case 'enable-smoke-test-driver': - case 'allow-dialogs-while-driven': case 'extensions-download-dir': case 'builtin-extensions-dir': case 'telemetry': diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts index 562eaeb7a3a..092618c6846 100644 --- a/src/vs/server/node/serverEnvironmentService.ts +++ b/src/vs/server/node/serverEnvironmentService.ts @@ -36,7 +36,6 @@ export const serverOptions: OptionDescriptions> = { 'user-data-dir': OPTIONS['user-data-dir'], 'enable-smoke-test-driver': OPTIONS['enable-smoke-test-driver'], - 'allow-dialogs-while-driven': OPTIONS['allow-dialogs-while-driven'], 'disable-telemetry': OPTIONS['disable-telemetry'], 'disable-experiments': OPTIONS['disable-experiments'], 'disable-workspace-trust': OPTIONS['disable-workspace-trust'], @@ -160,7 +159,6 @@ export interface ServerParsedArgs { 'user-data-dir'?: string; 'enable-smoke-test-driver'?: boolean; - 'allow-dialogs-while-driven'?: boolean; 'disable-telemetry'?: boolean; 'disable-experiments'?: boolean; diff --git a/src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts b/src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts index d61c6ff009a..3210a029e83 100644 --- a/src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts +++ b/src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts @@ -21,7 +21,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common import { Lazy } from '../../../../base/common/lazy.js'; import { IOpenerService } from '../../../../platform/opener/common/opener.js'; import { createNativeAboutDialogDetails } from '../../../../platform/dialogs/electron-browser/dialog.js'; -import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js'; export class DialogHandlerContribution extends Disposable implements IWorkbenchContribution { @@ -43,7 +42,6 @@ export class DialogHandlerContribution extends Disposable implements IWorkbenchC @IProductService private productService: IProductService, @IClipboardService clipboardService: IClipboardService, @INativeHostService private nativeHostService: INativeHostService, - @IWorkbenchEnvironmentService private environmentService: IWorkbenchEnvironmentService, @IOpenerService openerService: IOpenerService ) { super(); @@ -111,9 +109,7 @@ export class DialogHandlerContribution extends Disposable implements IWorkbenchC } private get useCustomDialog(): boolean { - return this.configurationService.getValue('window.dialogStyle') === 'custom' || - // Use the custom dialog while driven so that the driver can interact with it - !!this.environmentService.allowDialogsWhileDriven; + return this.configurationService.getValue('window.dialogStyle') === 'custom'; } } diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts index 30ed10c4842..7223babe5ef 100644 --- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts @@ -146,7 +146,7 @@ export abstract class AbstractFileDialogService implements IFileDialogService { return true; // integration tests } - return !this.environmentService.allowDialogsWhileDriven; + return !!this.environmentService.enableSmokeTestDriver; // smoke tests } private async doShowSaveConfirm(fileNamesOrResources: (string | URI)[]): Promise { diff --git a/src/vs/workbench/services/dialogs/common/dialogService.ts b/src/vs/workbench/services/dialogs/common/dialogService.ts index 8862e900bad..45c82286ee5 100644 --- a/src/vs/workbench/services/dialogs/common/dialogService.ts +++ b/src/vs/workbench/services/dialogs/common/dialogService.ts @@ -33,7 +33,7 @@ export class DialogService extends Disposable implements IDialogService { return true; // integration tests } - return !this.environmentService.allowDialogsWhileDriven; // smoke tests + return !!this.environmentService.enableSmokeTestDriver; // smoke tests } async confirm(confirmation: IConfirmation): Promise { diff --git a/src/vs/workbench/services/environment/common/environmentService.ts b/src/vs/workbench/services/environment/common/environmentService.ts index 5ac2100d9a4..5312892fe6f 100644 --- a/src/vs/workbench/services/environment/common/environmentService.ts +++ b/src/vs/workbench/services/environment/common/environmentService.ts @@ -41,7 +41,6 @@ export interface IWorkbenchEnvironmentService extends IEnvironmentService { readonly debugRenderer: boolean; readonly logExtensionHostCommunication?: boolean; readonly enableSmokeTestDriver?: boolean; - readonly allowDialogsWhileDriven?: boolean; readonly profDurationMarkers?: string[]; // --- Editors to open diff --git a/src/vs/workbench/services/environment/electron-browser/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts index cdf4a078188..6cfa51701be 100644 --- a/src/vs/workbench/services/environment/electron-browser/environmentService.ts +++ b/src/vs/workbench/services/environment/electron-browser/environmentService.ts @@ -119,9 +119,6 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment @memoize get enableSmokeTestDriver(): boolean { return !!this.args['enable-smoke-test-driver']; } - @memoize - get allowDialogsWhileDriven(): boolean { return !!this.args['allow-dialogs-while-driven']; } - @memoize get extensionEnabledProposedApi(): string[] | undefined { if (Array.isArray(this.args['enable-proposed-api'])) { diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts index 0ef2a69fea6..5732b2586ee 100644 --- a/test/automation/src/code.ts +++ b/test/automation/src/code.ts @@ -26,7 +26,6 @@ export interface LaunchOptions { readonly remote?: boolean; readonly web?: boolean; readonly tracing?: boolean; - readonly allowDialogs?: boolean; snapshots?: boolean; readonly headless?: boolean; readonly browser?: 'chromium' | 'webkit' | 'firefox' | 'chromium-msedge' | 'chromium-chrome'; diff --git a/test/automation/src/playwrightBrowser.ts b/test/automation/src/playwrightBrowser.ts index a032218ab82..ca4b67e5ed2 100644 --- a/test/automation/src/playwrightBrowser.ts +++ b/test/automation/src/playwrightBrowser.ts @@ -57,9 +57,6 @@ async function launchServer(options: LaunchOptions) { if (options.verbose) { args.push('--log=trace'); } - if (options.allowDialogs) { - args.push('--allow-dialogs-while-driven'); - } let serverLocation: string | undefined; if (codeServerPath) { diff --git a/test/automation/src/playwrightElectron.ts b/test/automation/src/playwrightElectron.ts index 1e68956a969..41eb4ec4150 100644 --- a/test/automation/src/playwrightElectron.ts +++ b/test/automation/src/playwrightElectron.ts @@ -15,9 +15,6 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess: // Resolve electron config and update const { electronPath, args, env } = await resolveElectronConfiguration(options); args.push('--enable-smoke-test-driver'); - if (options.allowDialogs) { - args.push('--allow-dialogs-while-driven'); - } // Launch electron via playwright const { electron, context, page } = await launchElectron({ electronPath, args, env }, options); diff --git a/test/mcp/src/playwright.ts b/test/mcp/src/playwright.ts index 5ec48dc3fc5..d6f0ec8dab7 100644 --- a/test/mcp/src/playwright.ts +++ b/test/mcp/src/playwright.ts @@ -30,8 +30,7 @@ const opts = minimist(args, { 'remote', 'web', 'headless', - 'tracing', - 'skip-dialogs' + 'tracing' ], default: { verbose: false @@ -44,7 +43,6 @@ const opts = minimist(args, { tracing?: boolean; build?: string; 'stable-build'?: string; - 'skip-dialogs'?: boolean; browser?: 'chromium' | 'webkit' | 'firefox' | 'chromium-msedge' | 'chromium-chrome' | undefined; electronArgs?: string; }; @@ -360,7 +358,6 @@ export async function getServer() { userDataDir, extensionsPath, logger, - allowDialogs: !opts['skip-dialogs'] && !opts.headless, logsPath: path.join(logsRootPath, 'suite_unknown'), crashesPath: path.join(crashesRootPath, 'suite_unknown'), verbose: opts.verbose,