@codingame/monaco-vscode-dialogs-service-override 20.4.1 → 21.0.0

package/index.js

@@ -8,6 +8,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "20.4.1",
+  "version": "21.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - dialogs service-override",
   "keywords": [],
@@ -15,9 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "20.4.1",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.4.1",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "20.4.1"
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.0",
+    "@codingame/monaco-vscode-api": "21.0.0",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "21.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.d.ts

@@ -10,6 +10,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 export declare class DialogHandlerContribution extends Disposable implements IWorkbenchContribution {
     private dialogService;
+    private productService;
     static readonly ID = "workbench.contrib.dialogHandler";
     private readonly model;
     private readonly impl;

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js

@@ -12,18 +12,19 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { createBrowserAboutDialogDetails } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/platform/dialogs/browser/dialog';
 
 let DialogHandlerContribution = class DialogHandlerContribution extends Disposable {
     static { this.ID = 'workbench.contrib.dialogHandler'; }
     constructor(dialogService, logService, layoutService, keybindingService, instantiationService, productService, clipboardService, openerService) {
         super();
         this.dialogService = dialogService;
+        this.productService = productService;
         this.impl = ( new Lazy(() => ( new BrowserDialogHandler(
             logService,
             layoutService,
             keybindingService,
             instantiationService,
-            productService,
             clipboardService,
             openerService
         ))));
@@ -53,7 +54,8 @@ let DialogHandlerContribution = class DialogHandlerContribution extends Disposab
                     result = await this.impl.value.prompt(args.prompt);
                 }
                 else {
-                    await this.impl.value.about();
+                    const aboutDialogDetails = createBrowserAboutDialogDetails(this.productService);
+                    await this.impl.value.about(aboutDialogDetails.title, aboutDialogDetails.details, aboutDialogDetails.detailsToCopy);
                 }
             }
             catch (error) {

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.d.ts

@@ -1,8 +1,7 @@
-import { IConfirmation, IConfirmationResult, IInputResult, IInput, AbstractDialogHandler, IPrompt, IAsyncPromptResult } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IInputResult, IInput, AbstractDialogHandler, IPrompt, IAsyncPromptResult } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
@@ -10,15 +9,14 @@ export declare class BrowserDialogHandler extends AbstractDialogHandler {
     private readonly logService;
     private readonly layoutService;
     private readonly keybindingService;
-    private readonly productService;
     private readonly clipboardService;
     private readonly openerService;
     private static readonly ALLOWABLE_COMMANDS;
     private readonly markdownRenderer;
-    constructor(logService: ILogService, layoutService: ILayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, productService: IProductService, clipboardService: IClipboardService, openerService: IOpenerService);
+    constructor(logService: ILogService, layoutService: ILayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, clipboardService: IClipboardService, openerService: IOpenerService);
     prompt<T>(prompt: IPrompt<T>): Promise<IAsyncPromptResult<T>>;
     confirm(confirmation: IConfirmation): Promise<IConfirmationResult>;
     input(input: IInput): Promise<IInputResult>;
-    about(): Promise<void>;
+    about(title: string, details: string, detailsToCopy: string): Promise<void>;
     private doShow;
 }

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.js

@@ -1,16 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { AbstractDialogHandler } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs';
+import { AbstractDialogHandler } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs';
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { Dialog } from '@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common/vscode/vs/base/browser/ui/dialog/dialog';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { MarkdownRenderer, openLinkFromMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -27,12 +25,11 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         'editor.action.clipboardCutAction',
         'editor.action.clipboardPasteAction'
     ]; }
-    constructor(logService, layoutService, keybindingService, instantiationService, productService, clipboardService, openerService) {
+    constructor(logService, layoutService, keybindingService, instantiationService, clipboardService, openerService) {
         super();
         this.logService = logService;
         this.layoutService = layoutService;
         this.keybindingService = keybindingService;
-        this.productService = productService;
         this.clipboardService = clipboardService;
         this.openerService = openerService;
         this.markdownRenderer = instantiationService.createInstance(MarkdownRenderer, {});
@@ -55,25 +52,13 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         const { button, checkboxChecked, values } = await this.doShow(input.type ?? 'question', input.message, buttons, input.detail, buttons.length - 1, input?.checkbox, input.inputs, typeof input.custom === 'object' ? input.custom : undefined);
         return { confirmed: button === 0, checkboxChecked, values };
     }
-    async about() {
-        const detailString = (useAgo) => {
-            return localize(
-                2956,
-                "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
-                this.productService.version || 'Unknown',
-                this.productService.commit || 'Unknown',
-                this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(( new Date(this.productService.date)), true) + ')' : ''}` : 'Unknown',
-                navigator.userAgent
-            );
-        };
-        const detail = detailString(true);
-        const detailToCopy = detailString(false);
-        const { button } = await this.doShow(Severity.Info, this.productService.nameLong, [
-            ( localize(2957, "&&Copy")),
-            ( localize(2958, "OK"))
-        ], detail, 1);
+    async about(title, details, detailsToCopy) {
+        const { button } = await this.doShow(Severity.Info, title, [
+            ( localize(2961, "&&Copy")),
+            ( localize(2962, "OK"))
+        ], details, 1);
         if (button === 0) {
-            this.clipboardService.writeText(detailToCopy);
+            this.clipboardService.writeText(detailsToCopy);
         }
     }
     async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions) {
@@ -81,17 +66,13 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         const renderBody = customOptions ? (parent) => {
             parent.classList.add(...(customOptions.classes || []));
             customOptions.markdownDetails?.forEach(markdownDetail => {
-                const result = this.markdownRenderer.render(markdownDetail.markdown, {
-                    actionHandler: {
-                        callback: markdownDetail.actionHandler || (link => {
-                            return openLinkFromMarkdown(this.openerService, link, markdownDetail.markdown.isTrusted, true );
-                        }),
-                        disposables: dialogDisposables
-                    }
-                });
+                const result = dialogDisposables.add(this.markdownRenderer.render(markdownDetail.markdown, {
+                    actionHandler: markdownDetail.actionHandler || ((link, mdStr) => {
+                        return openLinkFromMarkdown(this.openerService, link, mdStr.isTrusted, true );
+                    }),
+                }));
                 parent.appendChild(result.element);
                 result.element.classList.add(...(markdownDetail.classes || []));
-                dialogDisposables.add(result);
             });
         } : undefined;
         const dialog = ( new Dialog(
@@ -122,9 +103,8 @@ BrowserDialogHandler = BrowserDialogHandler_1 = ( __decorate([
     ( __param(1, ILayoutService)),
     ( __param(2, IKeybindingService)),
     ( __param(3, IInstantiationService)),
-    ( __param(4, IProductService)),
-    ( __param(5, IClipboardService)),
-    ( __param(6, IOpenerService))
+    ( __param(4, IClipboardService)),
+    ( __param(5, IOpenerService))
 ], BrowserDialogHandler));
 
 export { BrowserDialogHandler };

package/vscode/src/vs/workbench/common/dialogs.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IDialogArgs, IDialogResult } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IDialogArgs, IDialogResult } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 export interface IDialogViewItem {
     readonly args: IDialogArgs;
     close(result?: IDialogResult | Error): void;

package/vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.d.ts

@@ -1,4 +1,4 @@
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, ConfirmResult } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, ConfirmResult } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";

package/vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isWorkspaceToOpen, isFileToOpen } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
-import { ConfirmResult, getFileNamesMessage } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs';
+import { ConfirmResult, getFileNamesMessage } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { WorkbenchState, isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -111,27 +111,28 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         return this.doShowSaveConfirm(fileNamesOrResources);
     }
     skipDialogs() {
-        if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionTestsLocationURI) {
+        if (this.environmentService.enableSmokeTestDriver) {
+            this.logService.warn('DialogService: Dialog requested during smoke test.');
             return true;
         }
-        return !!this.environmentService.enableSmokeTestDriver;
+        return this.environmentService.isExtensionDevelopment && !!this.environmentService.extensionTestsLocationURI;
     }
     async doShowSaveConfirm(fileNamesOrResources) {
         if (fileNamesOrResources.length === 0) {
             return ConfirmResult.DONT_SAVE;
         }
         let message;
-        let detail = ( localize(12963, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(13161, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                12964,
+                13162,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         }
         else {
             message = ( localize(
-                12965,
+                13163,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
@@ -144,12 +145,12 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             buttons: [
                 {
                     label: fileNamesOrResources.length > 1 ?
-                        ( localize(12966, "&&Save All")) :
-                        ( localize(12967, "&&Save")),
+                        ( localize(13164, "&&Save All")) :
+                        ( localize(13165, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(12968, "Do&&n't Save")),
+                    label: ( localize(13166, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ],
@@ -163,7 +164,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         return schema === Schemas.untitled ? [Schemas.file] : (schema !== Schemas.file ? [schema, Schemas.file] : [schema]);
     }
     async pickFileFolderAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(12969, 'Open File or Folder'));
+        const title = ( localize(13167, 'Open File or Folder'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -181,7 +182,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(12970, 'Open File'));
+        const title = ( localize(13168, 'Open File'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -198,7 +199,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri, { appendWorkspaceSuffix: true }) }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(12971, 'Open Folder'));
+        const title = ( localize(13169, 'Open Folder'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -206,8 +207,8 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(12972, 'Open Workspace from File'));
-        const filters = [{ name: ( localize(12973, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
+        const title = ( localize(13170, 'Open Workspace from File'));
+        const filters = [{ name: ( localize(13171, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems });
         if (uri) {
@@ -218,7 +219,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(12974, 'Save As'));
+        options.title = ( localize(13172, 'Save As'));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -269,7 +270,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(12975, "Save As")),
+            title: ( localize(13173, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -296,10 +297,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             matchingFilter = { name: trim(ext, '.').toUpperCase(), extensions: [trim(ext, '.')] };
         }
         options.filters = coalesce([
-            { name: ( localize(12976, "All Files")), extensions: ['*'] },
+            { name: ( localize(13174, "All Files")), extensions: ['*'] },
             matchingFilter,
             ...registeredLanguageFilters,
-            { name: ( localize(12977, "No Extension")), extensions: [''] }
+            { name: ( localize(13175, "No Extension")), extensions: [''] }
         ]);
         return options;
     }

package/vscode/src/vs/workbench/services/dialogs/browser/fileDialogService.d.ts

@@ -1,4 +1,4 @@
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { AbstractFileDialogService } from "./abstractFileDialogService.js";

package/vscode/src/vs/workbench/services/dialogs/browser/fileDialogService.js

@@ -28,7 +28,7 @@ class FileDialogService extends AbstractFileDialogService {
         if (this.shouldUseSimplified(schema)) {
             return super.pickFileFolderAndOpenSimplified(schema, options, false);
         }
-        throw ( new Error(( localize(12978, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(13176, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     addFileSchemaIfNeeded(schema, isFolder) {
         return (schema === Schemas.untitled) ? [Schemas.file]
@@ -68,7 +68,7 @@ class FileDialogService extends AbstractFileDialogService {
         if (this.shouldUseSimplified(schema)) {
             return super.pickFolderAndOpenSimplified(schema, options);
         }
-        throw ( new Error(( localize(12978, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(13176, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     async pickWorkspaceAndOpen(options) {
         options.availableFileSystems = this.getWorkspaceAvailableFileSystems(options);
@@ -80,7 +80,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickWorkspaceAndOpenSimplified(schema, options);
         }
         throw ( new Error(( localize(
-            12979,
+            13177,
             "Can't open workspaces, try adding a folder to the workspace instead."
         ))));
     }
@@ -182,17 +182,17 @@ class FileDialogService extends AbstractFileDialogService {
         }
         const buttons = [
             {
-                label: ( localize(12980, "&&Open Remote...")),
+                label: ( localize(13178, "&&Open Remote...")),
                 run: async () => { await this.commandService.executeCommand('workbench.action.remote.showMenu'); }
             },
             {
-                label: ( localize(12981, "&&Learn More")),
+                label: ( localize(13179, "&&Learn More")),
                 run: async () => { await this.openerService.open('https://aka.ms/VSCodeWebLocalFileSystemAccess'); }
             }
         ];
         if (context === 'open') {
             buttons.push({
-                label: ( localize(12982, "Open &&Files...")),
+                label: ( localize(13180, "Open &&Files...")),
                 run: async () => {
                     const files = await triggerUpload();
                     if (files) {
@@ -212,9 +212,9 @@ class FileDialogService extends AbstractFileDialogService {
         }
         await this.dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(12983, "Opening Local Folders is Unsupported")),
+            message: ( localize(13181, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                12984,
+                13182,
                 "Your browser doesn't support opening local folders.\nYou can either open single files or open a remote repository."
             )),
             buttons

package/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.d.ts

@@ -1,7 +1,7 @@
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";

package/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.js

@@ -41,7 +41,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 var OpenLocalFileCommand;
 (function (OpenLocalFileCommand) {
     OpenLocalFileCommand.ID = 'workbench.action.files.openLocalFile';
-    OpenLocalFileCommand.LABEL = ( localize(12985, "Open Local File..."));
+    OpenLocalFileCommand.LABEL = ( localize(13183, "Open Local File..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -53,7 +53,7 @@ var OpenLocalFileCommand;
 var SaveLocalFileCommand;
 (function (SaveLocalFileCommand) {
     SaveLocalFileCommand.ID = 'workbench.action.files.saveLocalFile';
-    SaveLocalFileCommand.LABEL = ( localize(12986, "Save Local File..."));
+    SaveLocalFileCommand.LABEL = ( localize(13184, "Save Local File..."));
     function handler() {
         return accessor => {
             const editorService = accessor.get(IEditorService);
@@ -69,7 +69,7 @@ var SaveLocalFileCommand;
 var OpenLocalFolderCommand;
 (function (OpenLocalFolderCommand) {
     OpenLocalFolderCommand.ID = 'workbench.action.files.openLocalFolder';
-    OpenLocalFolderCommand.LABEL = ( localize(12987, "Open Local Folder..."));
+    OpenLocalFolderCommand.LABEL = ( localize(13185, "Open Local Folder..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -81,7 +81,7 @@ var OpenLocalFolderCommand;
 var OpenLocalFileFolderCommand;
 (function (OpenLocalFileFolderCommand) {
     OpenLocalFileFolderCommand.ID = 'workbench.action.files.openLocalFileFolder';
-    OpenLocalFileFolderCommand.LABEL = ( localize(12988, "Open Local..."));
+    OpenLocalFileFolderCommand.LABEL = ( localize(13186, "Open Local..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -200,7 +200,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
             this.notificationService.info(( localize(
-                12989,
+                13187,
                 'File system provider for {0} is not available.',
                 (defaultUri.toString())
             )));
@@ -274,7 +274,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;
             if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
                 this.filePickBox.customButton = true;
-                this.filePickBox.customLabel = ( localize(12990, 'Show Local'));
+                this.filePickBox.customLabel = ( localize(13188, 'Show Local'));
                 let action;
                 if (isSave) {
                     action = SaveLocalFileCommand;
@@ -426,7 +426,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     setButtons() {
         this.filePickBox.buttons = [{
                 iconClass: this._showDotFiles ? ThemeIcon.asClassName(Codicon.eye) : ThemeIcon.asClassName(Codicon.eyeClosed),
-                tooltip: this._showDotFiles ? ( localize(12991, "Hide dot files")) : ( localize(12992, "Show dot files")),
+                tooltip: this._showDotFiles ? ( localize(13189, "Hide dot files")) : ( localize(13190, "Show dot files")),
                 alwaysVisible: true
             }];
     }
@@ -586,7 +586,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                     return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
                 }
                 else if (this.endsWithSlash(value)) {
-                    this.filePickBox.validationMessage = ( localize(12993, 'The path does not exist. Use ~ to go to your home directory.'));
+                    this.filePickBox.validationMessage = ( localize(13191, 'The path does not exist. Use ~ to go to your home directory.'));
                     this.badPath = value;
                     return UpdateResult.InvalidPath;
                 }
@@ -744,7 +744,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(12994, 'Cancel'));
+        prompt.customLabel = ( localize(13192, 'Cancel'));
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
         return ( new Promise(resolve => {
@@ -772,7 +772,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(12995, 'Please enter a valid path.'));
+            this.filePickBox.validationMessage = ( localize(13193, 'Please enter a valid path.'));
             return Promise.resolve(false);
         }
         let stat;
@@ -785,36 +785,36 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if (this.requiresTrailing) {
             if (stat && stat.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(12996, 'The folder already exists. Please use a new file name.'));
+                this.filePickBox.validationMessage = ( localize(13194, 'The folder already exists. Please use a new file name.'));
                 return Promise.resolve(false);
             }
             else if (stat) {
                 const message = ( localize(
-                    12997,
+                    13195,
                     '{0} already exists. Are you sure you want to overwrite it?',
                     basename(uri)
                 ));
                 return this.yesNoPrompt(uri, message);
             }
             else if (!(isValidBasename(basename(uri), this.isWindows))) {
-                this.filePickBox.validationMessage = ( localize(12998, 'Please enter a valid file name.'));
+                this.filePickBox.validationMessage = ( localize(13196, 'Please enter a valid file name.'));
                 return Promise.resolve(false);
             }
             else if (!statDirname) {
                 const message = ( localize(
-                    12999,
+                    13197,
                     'The folder {0} does not exist. Would you like to create it?',
                     basename(dirname(uri))
                 ));
                 return this.yesNoPrompt(uri, message);
             }
             else if (!statDirname.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(13000, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(13198, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (statDirname.readonly) {
                 this.filePickBox.validationMessage = ( localize(
-                    13001,
+                    13199,
                     'This folder cannot be used as a save destination. Please choose another folder'
                 ));
                 return Promise.resolve(false);
@@ -822,19 +822,19 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( localize(13000, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(13198, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (uri.path === '/' && this.isWindows) {
-                this.filePickBox.validationMessage = ( localize(13002, 'Please start the path with a drive letter.'));
+                this.filePickBox.validationMessage = ( localize(13200, 'Please start the path with a drive letter.'));
                 return Promise.resolve(false);
             }
             else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( localize(13003, 'Please select a file.'));
+                this.filePickBox.validationMessage = ( localize(13201, 'Please select a file.'));
                 return Promise.resolve(false);
             }
             else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( localize(13004, 'Please select a folder.'));
+                this.filePickBox.validationMessage = ( localize(13202, 'Please select a folder.'));
                 return Promise.resolve(false);
             }
         }

package/vscode/src/vs/workbench/services/dialogs/common/dialogService.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfirmation, IConfirmationResult, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { DialogsModel } from "../../../common/dialogs.js";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";

package/vscode/src/vs/workbench/services/dialogs/common/dialogService.js

@@ -18,10 +18,11 @@ let DialogService = class DialogService extends Disposable {
         this.onDidShowDialog = this.model.onDidShowDialog;
     }
     skipDialogs() {
-        if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionTestsLocationURI) {
+        if (this.environmentService.enableSmokeTestDriver) {
+            this.logService.warn('DialogService: Dialog requested during smoke test.');
             return true;
         }
-        return !!this.environmentService.enableSmokeTestDriver;
+        return this.environmentService.isExtensionDevelopment && !!this.environmentService.extensionTestsLocationURI;
     }
     async confirm(confirmation) {
         if (this.skipDialogs()) {