@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/platform/actions/common/actions.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { SubmenuAction } from '../../../base/common/actions.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { MicrotaskEmitter } from '../../../base/common/event.js';
-import { toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { toDisposable, dispose, DisposableStore } from '../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../base/common/linkedList.js';
 import { CommandsRegistry } from '../../commands/common/commands.js';
 import { ICommandService } from '../../commands/common/commands.service.js';
@@ -382,32 +382,32 @@ class Action2 {
     }
 }
 function registerAction2(ctor) {
-    const disposables = ( new DisposableStore());
+    const disposables = [];
     const action = ( new ctor());
     const { f1, menu, keybinding, ...command } = action.desc;
     if (CommandsRegistry.getCommand(command.id)) {
         throw ( new Error(`Cannot register two commands with the same id: ${command.id}`));
     }
-    disposables.add(CommandsRegistry.registerCommand({
+    disposables.push(CommandsRegistry.registerCommand({
         id: command.id,
         handler: (accessor, ...args) => action.run(accessor, ...args),
         metadata: command.metadata,
     }));
     if (Array.isArray(menu)) {
         for (const item of menu) {
-            disposables.add(MenuRegistry.appendMenuItem(item.id, { command: { ...command, precondition: item.precondition === null ? undefined : command.precondition }, ...item }));
+            disposables.push(MenuRegistry.appendMenuItem(item.id, { command: { ...command, precondition: item.precondition === null ? undefined : command.precondition }, ...item }));
         }
     }
     else if (menu) {
-        disposables.add(MenuRegistry.appendMenuItem(menu.id, { command: { ...command, precondition: menu.precondition === null ? undefined : command.precondition }, ...menu }));
+        disposables.push(MenuRegistry.appendMenuItem(menu.id, { command: { ...command, precondition: menu.precondition === null ? undefined : command.precondition }, ...menu }));
     }
     if (f1) {
-        disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command, when: command.precondition }));
-        disposables.add(MenuRegistry.addCommand(command));
+        disposables.push(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command, when: command.precondition }));
+        disposables.push(MenuRegistry.addCommand(command));
     }
     if (Array.isArray(keybinding)) {
         for (const item of keybinding) {
-            disposables.add(KeybindingsRegistry.registerKeybindingRule({
+            disposables.push(KeybindingsRegistry.registerKeybindingRule({
                 ...item,
                 id: command.id,
                 when: command.precondition ? ( ContextKeyExpr.and(command.precondition, item.when)) : item.when
@@ -415,12 +415,16 @@ function registerAction2(ctor) {
         }
     }
     else if (keybinding) {
-        disposables.add(KeybindingsRegistry.registerKeybindingRule({
+        disposables.push(KeybindingsRegistry.registerKeybindingRule({
             ...keybinding,
             id: command.id,
             when: command.precondition ? ( ContextKeyExpr.and(command.precondition, keybinding.when)) : keybinding.when
         }));
     }
-    return disposables;
+    return {
+        dispose() {
+            dispose(disposables);
+        }
+    };
 }
 export { Action2, MenuId, MenuItemAction, MenuRegistry, SubmenuItemAction, isIMenuItem, isISubmenuItem, registerAction2 };

package/vscode/src/vs/platform/actions/common/menuService.js

@@ -6,6 +6,7 @@ import { MenuRegistry, isIMenuItem, MenuItemAction, SubmenuItemAction, isISubmen
 import { ICommandService } from '../../commands/common/commands.service.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.service.js';
 import { toAction, Separator } from '../../../base/common/actions.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { removeFastWithoutKeepingOrder } from '../../../base/common/arrays.js';
 import { localizeWithPath } from '../../../nls.js';
@@ -50,16 +51,16 @@ let PersistedMenuHideState = class PersistedMenuHideState {
         this._ignoreChangeEvent = false;
         this._hiddenByDefaultCache = ( (new Map()));
         try {
-            const raw = _storageService.get(PersistedMenuHideState_1._key, 0 , '{}');
+            const raw = _storageService.get(PersistedMenuHideState_1._key, StorageScope.PROFILE, '{}');
             this._data = JSON.parse(raw);
         }
         catch (err) {
             this._data = Object.create(null);
         }
-        this._disposables.add(_storageService.onDidChangeValue(0 , PersistedMenuHideState_1._key, this._disposables)(() => {
+        this._disposables.add(_storageService.onDidChangeValue(StorageScope.PROFILE, PersistedMenuHideState_1._key, this._disposables)(() => {
             if (!this._ignoreChangeEvent) {
                 try {
-                    const raw = _storageService.get(PersistedMenuHideState_1._key, 0 , '{}');
+                    const raw = _storageService.get(PersistedMenuHideState_1._key, StorageScope.PROFILE, '{}');
                     this._data = JSON.parse(raw);
                 }
                 catch (err) {
@@ -132,7 +133,7 @@ let PersistedMenuHideState = class PersistedMenuHideState {
         try {
             this._ignoreChangeEvent = true;
             const raw = JSON.stringify(this._data);
-            this._storageService.store(PersistedMenuHideState_1._key, raw, 0 , 0 );
+            this._storageService.store(PersistedMenuHideState_1._key, raw, StorageScope.PROFILE, StorageTarget.USER);
         }
         finally {
             this._ignoreChangeEvent = false;
@@ -202,7 +203,7 @@ let MenuInfo = MenuInfo_1 = class MenuInfo {
         const result = [];
         for (const group of this._menuGroups) {
             const [id, items] = group;
-            const activeActions = [];
+            let activeActions;
             for (const item of items) {
                 if (this._contextKeyService.contextMatchesRules(item.when)) {
                     const isMenuItem = isIMenuItem(item);
@@ -212,7 +213,7 @@ let MenuInfo = MenuInfo_1 = class MenuInfo {
                     const menuHide = createMenuHide(this._id, isMenuItem ? item.command : item, this._hiddenStates);
                     if (isMenuItem) {
                         const menuKeybinding = createConfigureKeybindingAction(item.command.id, item.when, this._commandService, this._keybindingService);
-                        activeActions.push(( (new MenuItemAction(
+                        (activeActions ??= []).push(( (new MenuItemAction(
                             item.command,
                             item.alt,
                             options,
@@ -233,12 +234,12 @@ let MenuInfo = MenuInfo_1 = class MenuInfo {
                         ))).createActionGroups(options);
                         const submenuActions = Separator.join(...( (groups.map(g => g[1]))));
                         if (submenuActions.length > 0) {
-                            activeActions.push(( (new SubmenuItemAction(item, menuHide, submenuActions))));
+                            (activeActions ??= []).push(( (new SubmenuItemAction(item, menuHide, submenuActions))));
                         }
                     }
                 }
             }
-            if (activeActions.length > 0) {
+            if (activeActions && activeActions.length > 0) {
                 result.push([id, activeActions]);
             }
         }

package/vscode/src/vs/platform/clipboard/browser/clipboardService.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { isSafari, isWebkitWebView } from '../../../base/browser/browser.js';
-import { onDidRegisterWindow, addDisposableListener, getActiveDocument, $ } from '../../../base/browser/dom.js';
+import { onDidRegisterWindow, addDisposableListener, getActiveWindow, getActiveDocument, $, isHTMLElement } from '../../../base/browser/dom.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { DeferredPromise } from '../../../base/common/async.js';
 import { Event } from '../../../base/common/event.js';
@@ -33,7 +33,7 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
                 this.webKitPendingClipboardWritePromise.cancel();
             }
             this.webKitPendingClipboardWritePromise = currentWritePromise;
-            navigator.clipboard.write([( new ClipboardItem({
+            getActiveWindow().navigator.clipboard.write([( new ClipboardItem({
                     'text/plain': currentWritePromise.p,
                 }))]).catch(async (err) => {
                 if (!(err instanceof Error) || err.name !== 'NotAllowedError' || !currentWritePromise.isRejected) {
@@ -56,7 +56,7 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
             return this.webKitPendingClipboardWritePromise.complete(text);
         }
         try {
-            return await navigator.clipboard.writeText(text);
+            return await getActiveWindow().navigator.clipboard.writeText(text);
         }
         catch (error) {
             console.error(error);
@@ -74,7 +74,7 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
         textArea.focus();
         textArea.select();
         activeDocument.execCommand('copy');
-        if (activeElement instanceof HTMLElement) {
+        if (isHTMLElement(activeElement)) {
             activeElement.focus();
         }
         activeDocument.body.removeChild(textArea);
@@ -84,7 +84,7 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
             return this.mapTextToType.get(type) || '';
         }
         try {
-            return await navigator.clipboard.readText();
+            return await getActiveWindow().navigator.clipboard.readText();
         }
         catch (error) {
             console.error(error);

package/vscode/src/vs/platform/configuration/common/configuration.js

@@ -12,16 +12,27 @@ function isConfigurationUpdateOverrides(thing) {
         && !thing.overrideIdentifier
         && (!thing.resource || thing.resource instanceof URI);
 }
+var ConfigurationTarget;
+( (function(ConfigurationTarget) {
+    ConfigurationTarget[ConfigurationTarget["APPLICATION"] = 1] = "APPLICATION";
+    ConfigurationTarget[ConfigurationTarget["USER"] = 2] = "USER";
+    ConfigurationTarget[ConfigurationTarget["USER_LOCAL"] = 3] = "USER_LOCAL";
+    ConfigurationTarget[ConfigurationTarget["USER_REMOTE"] = 4] = "USER_REMOTE";
+    ConfigurationTarget[ConfigurationTarget["WORKSPACE"] = 5] = "WORKSPACE";
+    ConfigurationTarget[ConfigurationTarget["WORKSPACE_FOLDER"] = 6] = "WORKSPACE_FOLDER";
+    ConfigurationTarget[ConfigurationTarget["DEFAULT"] = 7] = "DEFAULT";
+    ConfigurationTarget[ConfigurationTarget["MEMORY"] = 8] = "MEMORY";
+})(ConfigurationTarget || (ConfigurationTarget = {})));
 function ConfigurationTargetToString(configurationTarget) {
     switch (configurationTarget) {
-        case 1 : return 'APPLICATION';
-        case 2 : return 'USER';
-        case 3 : return 'USER_LOCAL';
-        case 4 : return 'USER_REMOTE';
-        case 5 : return 'WORKSPACE';
-        case 6 : return 'WORKSPACE_FOLDER';
-        case 7 : return 'DEFAULT';
-        case 8 : return 'MEMORY';
+        case ConfigurationTarget.APPLICATION: return 'APPLICATION';
+        case ConfigurationTarget.USER: return 'USER';
+        case ConfigurationTarget.USER_LOCAL: return 'USER_LOCAL';
+        case ConfigurationTarget.USER_REMOTE: return 'USER_REMOTE';
+        case ConfigurationTarget.WORKSPACE: return 'WORKSPACE';
+        case ConfigurationTarget.WORKSPACE_FOLDER: return 'WORKSPACE_FOLDER';
+        case ConfigurationTarget.DEFAULT: return 'DEFAULT';
+        case ConfigurationTarget.MEMORY: return 'MEMORY';
     }
 }
 function isConfigured(configValue) {
@@ -112,4 +123,4 @@ function getConfigurationValue(config, settingPath, defaultValue) {
 function getLanguageTagSettingPlainKey(settingKey) {
     return settingKey.replace(/[\[\]]/g, '');
 }
-export { ConfigurationTargetToString, addToValueTree, getConfigurationValue, getLanguageTagSettingPlainKey, isConfigurationOverrides, isConfigurationUpdateOverrides, isConfigured, removeFromValueTree, toValuesTree };
+export { ConfigurationTarget, ConfigurationTargetToString, addToValueTree, getConfigurationValue, getLanguageTagSettingPlainKey, isConfigurationOverrides, isConfigurationUpdateOverrides, isConfigured, removeFromValueTree, toValuesTree };

package/vscode/src/vs/platform/configuration/common/configurationModels.js

@@ -7,7 +7,8 @@ import { deepClone, deepFreeze, equals as equals$1 } from '../../../base/common/
 import { isObject, isUndefinedOrNull } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { getConfigurationValue, removeFromValueTree, addToValueTree, toValuesTree } from './configuration.js';
-import { OVERRIDE_PROPERTY_REGEX, overrideIdentifiersFromKey, Extensions } from './configurationRegistry.js';
+import { OVERRIDE_PROPERTY_REGEX, overrideIdentifiersFromKey, Extensions, ConfigurationScope } from './configurationRegistry.js';
+import { FileOperation } from '../../files/common/files.js';
 import { Registry } from '../../registry/common/platform.js';
 function freeze(data) {
     return Object.isFrozen(data) ? data : deepFreeze(data);
@@ -363,7 +364,7 @@ class ConfigurationModelParser {
             }
             else {
                 const propertySchema = configurationProperties[key];
-                const scope = propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : 3  : undefined;
+                const scope = propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW : undefined;
                 if (propertySchema?.restricted) {
                     restricted.push(key);
                 }
@@ -410,7 +411,7 @@ class UserSettings extends Disposable {
         this.parser = ( new ConfigurationModelParser(( this.userSettingsResource.toString()), logService));
         this._register(this.fileService.watch(extUri.dirname(this.userSettingsResource)));
         this._register(this.fileService.watch(this.userSettingsResource));
-        this._register(Event.any(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.userSettingsResource)), Event.filter(this.fileService.onDidRunOperation, e => (e.isOperation(0 ) || e.isOperation(3 ) || e.isOperation(1 ) || e.isOperation(4 )) && extUri.isEqual(e.resource, userSettingsResource)))(() => this._onDidChange.fire()));
+        this._register(Event.any(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.userSettingsResource)), Event.filter(this.fileService.onDidRunOperation, e => (e.isOperation(FileOperation.CREATE) || e.isOperation(FileOperation.COPY) || e.isOperation(FileOperation.DELETE) || e.isOperation(FileOperation.WRITE)) && extUri.isEqual(e.resource, userSettingsResource)))(() => this._onDidChange.fire()));
     }
     async loadConfiguration() {
         try {

package/vscode/src/vs/platform/configuration/common/configurationRegistry.js

@@ -231,7 +231,7 @@ class ConfigurationRegistry {
             }
         }
     }
-    validateAndRegisterProperties(configuration, validate = true, extensionInfo, restrictedProperties, scope = 3 , bucket) {
+    validateAndRegisterProperties(configuration, validate = true, extensionInfo, restrictedProperties, scope = ConfigurationScope.WINDOW, bucket) {
         scope = isUndefinedOrNull(configuration.scope) ? scope : configuration.scope;
         const properties = configuration.properties;
         if (properties) {
@@ -306,22 +306,22 @@ class ConfigurationRegistry {
     updateSchema(key, property) {
         allSettings.properties[key] = property;
         switch (property.scope) {
-            case 1 :
+            case ConfigurationScope.APPLICATION:
                 applicationSettings.properties[key] = property;
                 break;
-            case 2 :
+            case ConfigurationScope.MACHINE:
                 machineSettings.properties[key] = property;
                 break;
-            case 6 :
+            case ConfigurationScope.MACHINE_OVERRIDABLE:
                 machineOverridableSettings.properties[key] = property;
                 break;
-            case 3 :
+            case ConfigurationScope.WINDOW:
                 windowSettings.properties[key] = property;
                 break;
-            case 4 :
+            case ConfigurationScope.RESOURCE:
                 resourceSettings.properties[key] = property;
                 break;
-            case 5 :
+            case ConfigurationScope.LANGUAGE_OVERRIDABLE:
                 resourceSettings.properties[key] = property;
                 this.resourceLanguageSettingsSchema.properties[key] = property;
                 break;
@@ -330,20 +330,20 @@ class ConfigurationRegistry {
     removeFromSchema(key, property) {
         delete allSettings.properties[key];
         switch (property.scope) {
-            case 1 :
+            case ConfigurationScope.APPLICATION:
                 delete applicationSettings.properties[key];
                 break;
-            case 2 :
+            case ConfigurationScope.MACHINE:
                 delete machineSettings.properties[key];
                 break;
-            case 6 :
+            case ConfigurationScope.MACHINE_OVERRIDABLE:
                 delete machineOverridableSettings.properties[key];
                 break;
-            case 3 :
+            case ConfigurationScope.WINDOW:
                 delete windowSettings.properties[key];
                 break;
-            case 4 :
-            case 5 :
+            case ConfigurationScope.RESOURCE:
+            case ConfigurationScope.LANGUAGE_OVERRIDABLE:
                 delete resourceSettings.properties[key];
                 delete this.resourceLanguageSettingsSchema.properties[key];
                 break;
@@ -476,8 +476,8 @@ function getScopes() {
     for (const key of ( (Object.keys(configurationProperties)))) {
         scopes.push([key, configurationProperties[key].scope]);
     }
-    scopes.push(['launch', 4 ]);
-    scopes.push(['task', 4 ]);
+    scopes.push(['launch', ConfigurationScope.RESOURCE]);
+    scopes.push(['task', ConfigurationScope.RESOURCE]);
     return scopes;
 }
 export { ConfigurationScope, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationSettings, configurationDefaultsSchemaId, getDefaultValue, getScopes, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -2,11 +2,13 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { PauseableEmitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { cloneAndChange, distinct } from '../../../base/common/objects.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
 import { URI } from '../../../base/common/uri.js';
 import { localizeWithPath } from '../../../nls.js';
 import { CommandsRegistry } from '../../commands/common/commands.js';
+import { ConfigurationTarget } from '../../configuration/common/configuration.js';
 import { IConfigurationService } from '../../configuration/common/configuration.service.js';
 import { RawContextKey } from '../common/contextkey.js';
 import { IContextKeyService } from '../common/contextkey.service.js';
@@ -78,7 +80,7 @@ class ConfigAwareContextValuesContainer extends Context {
         this._configurationService = _configurationService;
         this._values = TernarySearchTree.forConfigKeys();
         this._listener = this._configurationService.onDidChangeConfiguration(event => {
-            if (event.source === 7 ) {
+            if (event.source === ConfigurationTarget.DEFAULT) {
                 const allKeys = Array.from(this._values, ([k]) => k);
                 this._values.clear();
                 emitter.fire(( (new ArrayContextKeyChangeEvent(allKeys))));
@@ -484,7 +486,7 @@ function setContext(accessor, contextKey, contextValue) {
 }
 function stringifyURIs(contextValue) {
     return cloneAndChange(contextValue, (obj) => {
-        if (typeof obj === 'object' && obj.$mid === 1 ) {
+        if (typeof obj === 'object' && obj.$mid === MarshalledId.Uri) {
             return (
                  (URI.revive(obj).toString())
             );