@codingame/monaco-vscode-dialogs-service-override 9.0.3 → 10.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "9.0.3",
+  "version": "10.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.1"
   }
 }

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

@@ -5,7 +5,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { BrowserDialogHandler } from './dialogHandler.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -70,7 +70,6 @@ DialogHandlerContribution = ( __decorate([
     ( __param(5, IProductService)),
     ( __param(6, IClipboardService))
 ], DialogHandlerContribution));
-registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, WorkbenchPhase.BlockStartup
-);
+registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, 1 );
 
 export { DialogHandlerContribution };

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

@@ -14,7 +14,6 @@ import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MarkdownRenderer } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 
 var BrowserDialogHandler_1;
 let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHandler {
@@ -58,7 +57,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
     async about() {
         const detailString = (useAgo) => {
             return ( localize(
-                5653,
+                5611,
                 "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
                 this.productService.version || 'Unknown',
                 this.productService.commit || 'Unknown',
@@ -69,8 +68,8 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         const detail = detailString(true);
         const detailToCopy = detailString(false);
         const { button } = await this.doShow(Severity$1.Info, this.productService.nameLong, [
-            ( localize(5654, "&&Copy")),
-            ( localize(5655, "OK"))
+            ( localize(5612, "&&Copy")),
+            ( localize(5613, "OK"))
         ], detail, 1);
         if (button === 0) {
             this.clipboardService.writeText(detailToCopy);
@@ -93,7 +92,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             type: this.getDialogType(type),
             keyEventProcessor: (event) => {
                 const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-                if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
+                if (resolved.kind === 2  && resolved.commandId) {
                     if (BrowserDialogHandler_1.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
                         EventHelper.stop(event, true);
                     }

package/vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.js

@@ -1,8 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -15,7 +13,7 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { WelcomeWidget } from './welcomeWidget.js';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { localize } from 'vscode/vscode/vs/nls';
 import { applicationConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -26,7 +24,7 @@ let WelcomeDialogContribution = class WelcomeDialogContribution extends Disposab
     constructor(storageService, environmentService, configurationService, contextService, codeEditorService, instantiationService, commandService, telemetryService, openerService, editorService) {
         super();
         this.isRendered = false;
-        if (!storageService.isNew(StorageScope.APPLICATION)) {
+        if (!storageService.isNew(-1 )) {
             return;
         }
         const setting = configurationService.inspect(configurationKey);
@@ -79,17 +77,17 @@ WelcomeDialogContribution = ( (__decorate([
     ( (__param(9, IEditorService)))
 ], WelcomeDialogContribution)));
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(WelcomeDialogContribution, LifecyclePhase.Eventually);
+    .registerWorkbenchContribution(WelcomeDialogContribution, 4 );
 const configurationRegistry = ( (Registry.as(Extensions$1.Configuration)));
 configurationRegistry.registerConfiguration({
     ...applicationConfigurationNodeBase,
     properties: {
         'workbench.welcome.experimental.dialog': {
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             type: 'boolean',
             default: false,
             tags: ['experimental'],
-            description: ( localize(2386, "When enabled, a welcome widget is shown in the editor"))
+            description: ( localize(2349, "When enabled, a welcome widget is shown in the editor"))
         }
     }
 });

package/vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.js

@@ -1,6 +1,5 @@
 import './media/welcomeWidget.css.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { OverlayWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { $, hide, append } from 'vscode/vscode/vs/base/browser/dom';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { MarkdownRenderer } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
@@ -71,7 +70,7 @@ class WelcomeWidget extends Disposable {
     }
     async buildWidgetContent(title, message, buttonText, buttonAction) {
         const actionBar = this._register(( (new ActionBar(this.element, {}))));
-        const action = this._register(( (new Action('dialog.close', ( localize(5656, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
+        const action = this._register(( (new Action('dialog.close', ( localize(5614, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
             this._hide();
         }))));
         actionBar.push(action, { icon: true, label: false });
@@ -134,7 +133,7 @@ class WelcomeWidget extends Disposable {
     }
     getPosition() {
         return {
-            preference: OverlayWidgetPositionPreference.TOP_RIGHT_CORNER
+            preference: 0
         };
     }
     _show() {

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

@@ -1,9 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { isWorkspaceToOpen, isFileToOpen } from 'vscode/vscode/vs/platform/window/common/window';
-import { ConfirmResult, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { WorkbenchState, isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -91,7 +91,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     }
     async defaultWorkspacePath(schemeFilter = this.getSchemeFilterForWindow()) {
         let defaultWorkspacePath;
-        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+        if (this.contextService.getWorkbenchState() === 3 ) {
             const configuration = this.contextService.getWorkspace().configuration;
             if (configuration?.scheme === schemeFilter && isSavedWorkspace(configuration, this.environmentService) && !isTemporaryWorkspace(configuration)) {
                 defaultWorkspacePath = dirname(configuration);
@@ -105,7 +105,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     async showSaveConfirm(fileNamesOrResources) {
         if (this.skipDialogs()) {
             this.logService.trace('FileDialogService: refused to show save confirmation dialog in tests.');
-            return ConfirmResult.DONT_SAVE;
+            return 1 ;
         }
         return this.doShowSaveConfirm(fileNamesOrResources);
     }
@@ -117,20 +117,20 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     }
     async doShowSaveConfirm(fileNamesOrResources) {
         if (fileNamesOrResources.length === 0) {
-            return ConfirmResult.DONT_SAVE;
+            return 1 ;
         }
         let message;
-        let detail = ( localize(5637, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(5595, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                5638,
+                5596,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         }
         else {
             message = ( localize(
-                5639,
+                5597,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
@@ -143,17 +143,17 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             buttons: [
                 {
                     label: fileNamesOrResources.length > 1 ?
-                        ( localize(5640, "&&Save All")) :
-                        ( localize(5641, "&&Save")),
-                    run: () => ConfirmResult.SAVE
+                        ( localize(5598, "&&Save All")) :
+                        ( localize(5599, "&&Save")),
+                    run: () => 0
                 },
                 {
-                    label: ( localize(5642, "Do&&n't Save")),
-                    run: () => ConfirmResult.DONT_SAVE
+                    label: ( localize(5600, "Do&&n't Save")),
+                    run: () => 1
                 }
             ],
             cancelButton: {
-                run: () => ConfirmResult.CANCEL
+                run: () => 2
             }
         });
         return result;
@@ -162,7 +162,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(5643, 'Open File or Folder'));
+        const title = ( localize(5601, '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) {
@@ -180,7 +180,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(5644, 'Open File'));
+        const title = ( localize(5602, '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) {
@@ -197,7 +197,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri) }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(5645, 'Open Folder'));
+        const title = ( localize(5603, '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) {
@@ -205,8 +205,8 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(5646, 'Open Workspace from File'));
-        const filters = [{ name: ( localize(5647, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
+        const title = ( localize(5604, 'Open Workspace from File'));
+        const filters = [{ name: ( localize(5605, '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) {
@@ -217,7 +217,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(5648, 'Save As'));
+        options.title = ( localize(5606, 'Save As'));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -268,7 +268,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(5649, "Save As")),
+            title: ( localize(5607, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -295,10 +295,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             matchingFilter = { name: trim(ext, '.').toUpperCase(), extensions: [trim(ext, '.')] };
         }
         options.filters = coalesce([
-            { name: ( localize(5650, "All Files")), extensions: ['*'] },
+            { name: ( localize(5608, "All Files")), extensions: ['*'] },
             matchingFilter,
             ...registeredLanguageFilters,
-            { name: ( localize(5651, "No Extension")), extensions: [''] }
+            { name: ( localize(5609, "No Extension")), extensions: [''] }
         ]);
         return options;
     }

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

@@ -1,6 +1,5 @@
 import { __decorate } from 'vscode/external/tslib/tslib.es6.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { AbstractFileDialogService } from './abstractFileDialogService.js';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
@@ -28,7 +27,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickFileFolderAndOpenSimplified(schema, options, false);
         }
         throw ( (new Error(
-            localize(2379, "Can't open folders, try adding a folder to the workspace instead.")
+            localize(2342, "Can't open folders, try adding a folder to the workspace instead.")
         )));
     }
     addFileSchemaIfNeeded(schema, isFolder) {
@@ -70,7 +69,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickFolderAndOpenSimplified(schema, options);
         }
         throw ( (new Error(
-            localize(2379, "Can't open folders, try adding a folder to the workspace instead.")
+            localize(2342, "Can't open folders, try adding a folder to the workspace instead.")
         )));
     }
     async pickWorkspaceAndOpen(options) {
@@ -83,7 +82,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickWorkspaceAndOpenSimplified(schema, options);
         }
         throw ( (new Error(localize(
-            2380,
+            2343,
             "Can't open workspaces, try adding a folder to the workspace instead."
         ))));
     }
@@ -185,17 +184,17 @@ class FileDialogService extends AbstractFileDialogService {
         }
         const buttons = [
             {
-                label: ( localize(2381, "&&Open Remote...")),
+                label: ( localize(2344, "&&Open Remote...")),
                 run: async () => { await this.commandService.executeCommand('workbench.action.remote.showMenu'); }
             },
             {
-                label: ( localize(2382, "&&Learn More")),
+                label: ( localize(2345, "&&Learn More")),
                 run: async () => { await this.openerService.open('https://aka.ms/VSCodeWebLocalFileSystemAccess'); }
             }
         ];
         if (context === 'open') {
             buttons.push({
-                label: ( localize(2383, "Open &&Files...")),
+                label: ( localize(2346, "Open &&Files...")),
                 run: async () => {
                     const files = await triggerUpload();
                     if (files) {
@@ -215,9 +214,9 @@ class FileDialogService extends AbstractFileDialogService {
         }
         await this.dialogService.prompt({
             type: Severity$1.Warning,
-            message: ( localize(2384, "Opening Local Folders is Unsupported")),
+            message: ( localize(2347, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                2385,
+                2348,
                 "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.js

@@ -7,7 +7,7 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { isWindows, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
+import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
@@ -24,11 +24,10 @@ import { format, equalsIgnoreCase, startsWithIgnoreCase } from 'vscode/vscode/vs
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { isValidBasename } from 'vscode/vscode/vs/base/common/extpath';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { createCancelablePromise } from 'vscode/vscode/vs/base/common/async';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { normalizeDriveLetter } from 'vscode/vscode/vs/base/common/labels';
-import { SaveReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { getActiveDocument } from 'vscode/vscode/vs/base/browser/dom';
@@ -36,7 +35,7 @@ import { getActiveDocument } from 'vscode/vscode/vs/base/browser/dom';
 var OpenLocalFileCommand;
 ( ((function(OpenLocalFileCommand) {
     OpenLocalFileCommand.ID = 'workbench.action.files.openLocalFile';
-    OpenLocalFileCommand.LABEL = ( localize(10152, "Open Local File..."));
+    OpenLocalFileCommand.LABEL = ( localize(10225, "Open Local File..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -48,13 +47,13 @@ var OpenLocalFileCommand;
 var SaveLocalFileCommand;
 ( ((function(SaveLocalFileCommand) {
     SaveLocalFileCommand.ID = 'workbench.action.files.saveLocalFile';
-    SaveLocalFileCommand.LABEL = ( localize(10153, "Save Local File..."));
+    SaveLocalFileCommand.LABEL = ( localize(10226, "Save Local File..."));
     function handler() {
         return accessor => {
             const editorService = accessor.get(IEditorService);
             const activeEditorPane = editorService.activeEditorPane;
             if (activeEditorPane) {
-                return editorService.save({ groupId: activeEditorPane.group.id, editor: activeEditorPane.input }, { saveAs: true, availableFileSystems: [Schemas.file], reason: SaveReason.EXPLICIT });
+                return editorService.save({ groupId: activeEditorPane.group.id, editor: activeEditorPane.input }, { saveAs: true, availableFileSystems: [Schemas.file], reason: 1  });
             }
             return Promise.resolve(undefined);
         };
@@ -64,7 +63,7 @@ var SaveLocalFileCommand;
 var OpenLocalFolderCommand;
 ( ((function(OpenLocalFolderCommand) {
     OpenLocalFolderCommand.ID = 'workbench.action.files.openLocalFolder';
-    OpenLocalFolderCommand.LABEL = ( localize(10154, "Open Local Folder..."));
+    OpenLocalFolderCommand.LABEL = ( localize(10227, "Open Local Folder..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -76,7 +75,7 @@ var OpenLocalFolderCommand;
 var OpenLocalFileFolderCommand;
 ( ((function(OpenLocalFileFolderCommand) {
     OpenLocalFileFolderCommand.ID = 'workbench.action.files.openLocalFileFolder';
-    OpenLocalFileFolderCommand.LABEL = ( localize(10155, "Open Local..."));
+    OpenLocalFileFolderCommand.LABEL = ( localize(10228, "Open Local..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -94,8 +93,9 @@ var UpdateResult;
     UpdateResult[UpdateResult["InvalidPath"] = 4] = "InvalidPath";
 })(UpdateResult || (UpdateResult = {}))));
 const RemoteFileDialogContext = ( (new RawContextKey('remoteFileDialogVisible', false)));
-let SimpleFileDialog = class SimpleFileDialog {
+let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     constructor(fileService, quickInputService, labelService, workspaceContextService, notificationService, fileDialogService, modelService, languageService, environmentService, remoteAgentService, pathService, keybindingService, contextKeyService, accessibilityService) {
+        super();
         this.fileService = fileService;
         this.quickInputService = quickInputService;
         this.labelService = labelService;
@@ -117,10 +117,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         this.autoCompletePathSegment = '';
         this.isWindows = false;
         this.separator = '/';
-        this.onBusyChangeEmitter = ( (new Emitter()));
-        this.disposables = [
-            this.onBusyChangeEmitter
-        ];
+        this.onBusyChangeEmitter = this._register(( (new Emitter())));
         this.remoteAuthority = this.environmentService.remoteAuthority;
         this.contextKey = RemoteFileDialogContext.bindTo(contextKeyService);
         this.scheme = this.pathService.defaultUriScheme;
@@ -180,7 +177,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
             this.notificationService.info(( localize(
-                10156,
+                10229,
                 'File system provider for {0} is not available.',
                  (defaultUri.toString())
             )));
@@ -246,7 +243,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         }
         return (
              (new Promise((resolve) => {
-                this.filePickBox = this.quickInputService.createQuickPick();
+                this.filePickBox = this._register(this.quickInputService.createQuickPick());
                 this.busy = true;
                 this.filePickBox.matchOnLabel = false;
                 this.filePickBox.sortByLabel = false;
@@ -254,7 +251,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                 this.filePickBox.ok = true;
                 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(10157, 'Show Local'));
+                    this.filePickBox.customLabel = ( localize(10230, 'Show Local'));
                     let action;
                     if (isSave) {
                         action = SaveLocalFileCommand;
@@ -278,17 +275,16 @@ let SimpleFileDialog = class SimpleFileDialog {
                 this.filePickBox.title = this.options.title;
                 this.filePickBox.value = this.pathFromUri(this.currentFolder, true);
                 this.filePickBox.valueSelection = [this.filePickBox.value.length, this.filePickBox.value.length];
-                function doResolve(dialog, uri) {
+                const doResolve = (uri) => {
                     if (uri) {
-                        uri = addTrailingPathSeparator(uri, dialog.separator);
+                        uri = addTrailingPathSeparator(uri, this.separator);
                         uri = removeTrailingPathSeparator(uri);
                     }
                     resolve(uri);
-                    dialog.contextKey.set(false);
-                    dialog.filePickBox.dispose();
-                    dispose(dialog.disposables);
-                }
-                this.filePickBox.onDidCustom(() => {
+                    this.contextKey.set(false);
+                    this.dispose();
+                };
+                this._register(this.filePickBox.onDidCustom(() => {
                     if (isAcceptHandled || this.busy) {
                         return;
                     }
@@ -300,20 +296,20 @@ let SimpleFileDialog = class SimpleFileDialog {
                     this.filePickBox.hide();
                     if (isSave) {
                         return this.fileDialogService.showSaveDialog(this.options).then(result => {
-                            doResolve(this, result);
+                            doResolve(result);
                         });
                     }
                     else {
                         return this.fileDialogService.showOpenDialog(this.options).then(result => {
-                            doResolve(this, result ? result[0] : undefined);
+                            doResolve(result ? result[0] : undefined);
                         });
                     }
-                });
-                function handleAccept(dialog) {
-                    if (dialog.busy) {
-                        dialog.onBusyChangeEmitter.event((busy) => {
+                }));
+                const handleAccept = () => {
+                    if (this.busy) {
+                        this.onBusyChangeEmitter.event((busy) => {
                             if (!busy) {
-                                handleAccept(dialog);
+                                handleAccept();
                             }
                         });
                         return;
@@ -323,24 +319,24 @@ let SimpleFileDialog = class SimpleFileDialog {
                     }
                     isAcceptHandled = true;
                     isResolving++;
-                    dialog.onDidAccept().then(resolveValue => {
+                    this.onDidAccept().then(resolveValue => {
                         if (resolveValue) {
-                            dialog.filePickBox.hide();
-                            doResolve(dialog, resolveValue);
+                            this.filePickBox.hide();
+                            doResolve(resolveValue);
                         }
-                        else if (dialog.hidden) {
-                            doResolve(dialog, undefined);
+                        else if (this.hidden) {
+                            doResolve(undefined);
                         }
                         else {
                             isResolving--;
                             isAcceptHandled = false;
                         }
                     });
-                }
-                this.filePickBox.onDidAccept(_ => {
-                    handleAccept(this);
-                });
-                this.filePickBox.onDidChangeActive(i => {
+                };
+                this._register(this.filePickBox.onDidAccept(_ => {
+                    handleAccept();
+                }));
+                this._register(this.filePickBox.onDidChangeActive(i => {
                     isAcceptHandled = false;
                     if ((i.length === 1) && this.isSelectionChangeFromUser()) {
                         this.filePickBox.validationMessage = undefined;
@@ -351,16 +347,16 @@ let SimpleFileDialog = class SimpleFileDialog {
                         }
                         this.setAutoComplete(userPath, this.userEnteredPathSegment, i[0], true);
                     }
-                });
-                this.filePickBox.onDidChangeValue(async (value) => {
+                }));
+                this._register(this.filePickBox.onDidChangeValue(async (value) => {
                     return this.handleValueChange(value);
-                });
-                this.filePickBox.onDidHide(() => {
+                }));
+                this._register(this.filePickBox.onDidHide(() => {
                     this.hidden = true;
                     if (isResolving === 0) {
-                        doResolve(this, undefined);
+                        doResolve(undefined);
                     }
-                });
+                }));
                 this.filePickBox.show();
                 this.contextKey.set(true);
                 this.updateItems(homedir, true, this.trailing).then(() => {
@@ -375,6 +371,9 @@ let SimpleFileDialog = class SimpleFileDialog {
             }))
         );
     }
+    dispose() {
+        super.dispose();
+    }
     async handleValueChange(value) {
         try {
             if (this.isValueChangeFromUser()) {
@@ -548,7 +547,7 @@ let SimpleFileDialog = class SimpleFileDialog {
                     return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
                 }
                 else if (this.endsWithSlash(value)) {
-                    this.filePickBox.validationMessage = ( localize(10158, 'The path does not exist.'));
+                    this.filePickBox.validationMessage = ( localize(10231, 'The path does not exist.'));
                     this.badPath = value;
                     return UpdateResult.InvalidPath;
                 }
@@ -700,42 +699,43 @@ let SimpleFileDialog = class SimpleFileDialog {
         return ((path.length > 1) && this.endsWithSlash(path)) ? path.substr(0, path.length - 1) : path;
     }
     yesNoPrompt(uri, message) {
-        const prompt = this.quickInputService.createQuickPick();
+        const disposableStore = ( (new DisposableStore()));
+        const prompt = disposableStore.add(this.quickInputService.createQuickPick());
         prompt.title = message;
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(10159, 'Cancel'));
+        prompt.customLabel = ( localize(10232, 'Cancel'));
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
         return (
              (new Promise(resolve => {
-                prompt.onDidAccept(() => {
+                disposableStore.add(prompt.onDidAccept(() => {
                     isResolving = true;
                     prompt.hide();
                     resolve(true);
-                });
-                prompt.onDidHide(() => {
+                }));
+                disposableStore.add(prompt.onDidHide(() => {
                     if (!isResolving) {
                         resolve(false);
                     }
                     this.filePickBox.show();
                     this.hidden = false;
-                    prompt.dispose();
-                });
-                prompt.onDidChangeValue(() => {
+                    disposableStore.dispose();
+                }));
+                disposableStore.add(prompt.onDidChangeValue(() => {
                     prompt.hide();
-                });
-                prompt.onDidCustom(() => {
+                }));
+                disposableStore.add(prompt.onDidCustom(() => {
                     prompt.hide();
-                });
+                }));
                 prompt.show();
             }))
         );
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(10160, 'Please enter a valid path.'));
+            this.filePickBox.validationMessage = ( localize(10233, 'Please enter a valid path.'));
             return Promise.resolve(false);
         }
         let stat;
@@ -748,36 +748,36 @@ let SimpleFileDialog = class SimpleFileDialog {
         }
         if (this.requiresTrailing) {
             if (stat && stat.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(10161, 'The folder already exists. Please use a new file name.'));
+                this.filePickBox.validationMessage = ( localize(10234, 'The folder already exists. Please use a new file name.'));
                 return Promise.resolve(false);
             }
             else if (stat) {
                 const message = ( localize(
-                    10162,
+                    10235,
                     '{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(10163, 'Please enter a valid file name.'));
+                this.filePickBox.validationMessage = ( localize(10236, 'Please enter a valid file name.'));
                 return Promise.resolve(false);
             }
             else if (!statDirname) {
                 const message = ( localize(
-                    10164,
+                    10237,
                     '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(10165, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(10238, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (statDirname.readonly) {
                 this.filePickBox.validationMessage = ( localize(
-                    10166,
+                    10239,
                     'This folder cannot be used as a save destination. Please choose another folder'
                 ));
                 return Promise.resolve(false);
@@ -785,19 +785,19 @@ let SimpleFileDialog = class SimpleFileDialog {
         }
         else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( localize(10165, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(10238, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (uri.path === '/' && this.isWindows) {
-                this.filePickBox.validationMessage = ( localize(10167, 'Please start the path with a drive letter.'));
+                this.filePickBox.validationMessage = ( localize(10240, 'Please start the path with a drive letter.'));
                 return Promise.resolve(false);
             }
             else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( localize(10168, 'Please select a file.'));
+                this.filePickBox.validationMessage = ( localize(10241, 'Please select a file.'));
                 return Promise.resolve(false);
             }
             else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( localize(10169, 'Please select a folder.'));
+                this.filePickBox.validationMessage = ( localize(10242, 'Please select a folder.'));
                 return Promise.resolve(false);
             }
         }
@@ -878,7 +878,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         let isWindowsOS = isWindows;
         const env = await this.getRemoteAgentEnvironment();
         if (env) {
-            isWindowsOS = env.os === OperatingSystem.Windows;
+            isWindowsOS = env.os === 1 ;
         }
         return isWindowsOS;
     }

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

@@ -3,7 +3,6 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { DialogsModel } from '../../../common/dialogs.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';