@codingame/monaco-vscode-dialogs-service-override 5.3.0 → 6.0.0

package/dialogs.js

@@ -1,56 +1,22 @@
 import { DialogService } from './vscode/src/vs/workbench/services/dialogs/common/dialogService.js';
 import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { AbstractFileDialogService } from './vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.js';
 import { FileDialogService } from './vscode/src/vs/workbench/services/dialogs/browser/fileDialogService.js';
-import { unsupported } from './tools.js';
 import './vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js';
 import './vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.js';
 
-class DialogServiceOverride extends AbstractFileDialogService {
-    constructor() {
-        super(...arguments);
-        this.pickWorkspaceAndOpen = unsupported;
-    }
-    async pickFileFolderAndOpen(options) {
-        const schema = this.getFileSystemSchema(options);
-        if (options.defaultUri == null) {
-            options.defaultUri = await this.defaultFilePath(schema);
-        }
-        return super.pickFileFolderAndOpenSimplified(schema, options, false);
-    }
-    async pickFolderAndOpen(options) {
-        const schema = this.getFileSystemSchema(options);
-        if (options.defaultUri == null) {
-            options.defaultUri = await this.defaultFolderPath(schema);
-        }
-        return super.pickFolderAndOpenSimplified(schema, options);
-    }
-    async pickFileAndOpen(options) {
-        const schema = this.getFileSystemSchema(options);
-        if (options.defaultUri == null) {
-            options.defaultUri = await this.defaultFilePath(schema);
-        }
-        return super.pickFileAndOpenSimplified(schema, options, false);
-    }
-    async showSaveDialog(options) {
-        const schema = this.getFileSystemSchema(options);
-        return super.showSaveDialogSimplified(schema, options);
-    }
-    async showOpenDialog(options) {
-        const schema = this.getFileSystemSchema(options);
-        return super.showOpenDialogSimplified(schema, options);
-    }
-    async pickFileToSave(defaultUri, availableFileSystems) {
-        const schema = this.getFileSystemSchema({ defaultUri, availableFileSystems });
-        const options = this.getPickFileToSaveDialogOptions(defaultUri, availableFileSystems);
-        return super.pickFileToSaveSimplified(schema, options);
+function isHTMLFileSystemProvider(provider) {
+    return provider.directories != null;
+}
+class DialogServiceOverride extends FileDialogService {
+    shouldUseSimplified(scheme) {
+        return !isHTMLFileSystemProvider(super.fileSystemProvider) || super.shouldUseSimplified(scheme);
     }
 }
-function getServiceOverride({ useHtmlFileSystemProvider = false } = {}) {
+function getServiceOverride() {
     return {
         [( IDialogService.toString())]: new SyncDescriptor(DialogService, undefined, true),
-        [( IFileDialogService.toString())]: useHtmlFileSystemProvider ? new SyncDescriptor(FileDialogService, undefined, true) : new SyncDescriptor(DialogServiceOverride, undefined, true)
+        [( IFileDialogService.toString())]: new SyncDescriptor(DialogServiceOverride, undefined, true)
     };
 }
 

package/package.json

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

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 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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,6 +70,7 @@ DialogHandlerContribution = ( __decorate([
     ( __param(5, IProductService)),
     ( __param(6, IClipboardService))
 ], DialogHandlerContribution));
-registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, 1 );
+registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, WorkbenchPhase.BlockStartup
+);
 
 export { DialogHandlerContribution };

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

@@ -14,6 +14,7 @@ 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;
 const _moduleId = "vs/workbench/browser/parts/dialogs/dialogHandler";
@@ -94,7 +95,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 === 2  && resolved.commandId) {
+                if (resolved.kind === ResultKind.KbFound && 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,6 +1,8 @@
 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';
@@ -13,7 +15,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 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { applicationConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -25,7 +27,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(-1 )) {
+        if (!storageService.isNew(StorageScope.APPLICATION)) {
             return;
         }
         const setting = configurationService.inspect(configurationKey);
@@ -78,13 +80,13 @@ WelcomeDialogContribution = ( (__decorate([
     ( (__param(9, IEditorService)))
 ], WelcomeDialogContribution)));
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(WelcomeDialogContribution, 4 );
+    .registerWorkbenchContribution(WelcomeDialogContribution, LifecyclePhase.Eventually);
 const configurationRegistry = ( (Registry.as(Extensions$1.Configuration)));
 configurationRegistry.registerConfiguration({
     ...applicationConfigurationNodeBase,
     properties: {
         'workbench.welcome.experimental.dialog': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
             tags: ['experimental'],

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

@@ -1,5 +1,6 @@
 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';
@@ -134,7 +135,7 @@ class WelcomeWidget extends Disposable {
     }
     getPosition() {
         return {
-            preference: 0
+            preference: OverlayWidgetPositionPreference.TOP_RIGHT_CORNER
         };
     }
     _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 { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isWorkspaceToOpen, isFileToOpen } from 'vscode/vscode/vs/platform/window/common/window';
-import { getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { ConfirmResult, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState, 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';
@@ -92,7 +92,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     }
     async defaultWorkspacePath(schemeFilter = this.getSchemeFilterForWindow()) {
         let defaultWorkspacePath;
-        if (this.contextService.getWorkbenchState() === 3 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             const configuration = this.contextService.getWorkspace().configuration;
             if (configuration?.scheme === schemeFilter && isSavedWorkspace(configuration, this.environmentService) && !isTemporaryWorkspace(configuration)) {
                 defaultWorkspacePath = dirname(configuration);
@@ -106,7 +106,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     async showSaveConfirm(fileNamesOrResources) {
         if (this.skipDialogs()) {
             this.logService.trace('FileDialogService: refused to show save confirmation dialog in tests.');
-            return 1 ;
+            return ConfirmResult.DONT_SAVE;
         }
         return this.doShowSaveConfirm(fileNamesOrResources);
     }
@@ -118,7 +118,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     }
     async doShowSaveConfirm(fileNamesOrResources) {
         if (fileNamesOrResources.length === 0) {
-            return 1 ;
+            return ConfirmResult.DONT_SAVE;
         }
         let message;
         let detail = ( localizeWithPath(_moduleId, 0, "Your changes will be lost if you don't save them."));
@@ -148,15 +148,15 @@ let AbstractFileDialogService = class AbstractFileDialogService {
                     label: fileNamesOrResources.length > 1 ?
                         ( localizeWithPath(_moduleId, 3, "&&Save All")) :
                         ( localizeWithPath(_moduleId, 4, "&&Save")),
-                    run: () => 0
+                    run: () => ConfirmResult.SAVE
                 },
                 {
                     label: ( localizeWithPath(_moduleId, 5, "Do&&n't Save")),
-                    run: () => 1
+                    run: () => ConfirmResult.DONT_SAVE
                 }
             ],
             cancelButton: {
-                run: () => 2
+                run: () => ConfirmResult.CANCEL
             }
         });
         return result;

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

@@ -1,5 +1,6 @@
 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';

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 } from 'vscode/vscode/vs/base/common/platform';
+import { isWindows, OperatingSystem } 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';
@@ -28,6 +28,7 @@ import { dispose } 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';
@@ -54,7 +55,7 @@ var SaveLocalFileCommand;
             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: 1  });
+                return editorService.save({ groupId: activeEditorPane.group.id, editor: activeEditorPane.input }, { saveAs: true, availableFileSystems: [Schemas.file], reason: SaveReason.EXPLICIT });
             }
             return Promise.resolve(undefined);
         };
@@ -882,7 +883,7 @@ let SimpleFileDialog = class SimpleFileDialog {
         let isWindowsOS = isWindows;
         const env = await this.getRemoteAgentEnvironment();
         if (env) {
-            isWindowsOS = env.os === 1 ;
+            isWindowsOS = env.os === OperatingSystem.Windows;
         }
         return isWindowsOS;
     }

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

@@ -3,6 +3,7 @@ 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';
 

package/tools.js

@@ -1,42 +0,0 @@
-function unsupported() {
-    throw new Error('unsupported');
-}
-function memoized(fct) {
-    let v = null;
-    return (...args) => {
-        if (v == null) {
-            v = fct(...args);
-        }
-        return v;
-    };
-}
-function memoizedConstructor(ctor) {
-    return new Proxy(ctor, {
-        construct: memoized((target, args) => {
-            return Reflect.construct(ctor, args);
-        })
-    });
-}
-async function sleep(duration) {
-    await new Promise(resolve => setTimeout(resolve, duration));
-}
-function throttle(fct, merge, delay) {
-    let lastPromise = Promise.resolve();
-    let toConsume = null;
-    return async (param) => {
-        if (toConsume == null) {
-            toConsume = param;
-            lastPromise = lastPromise.then(async () => sleep(delay)).then(async () => {
-                const _toConsume = toConsume;
-                toConsume = null;
-                await fct(_toConsume);
-            });
-        }
-        else {
-            toConsume = merge(toConsume, param);
-        }
-        await lastPromise;
-    };
-}
-
-export { memoized, memoizedConstructor, sleep, throttle, unsupported };