@codingame/monaco-vscode-api 13.1.7 → 14.0.0

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js

@@ -115,7 +115,7 @@ function fillInActions(groups, target, useAlternativeActions, isPrimaryAction =
 }
 let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewItem {
     constructor(action, _options, _keybindingService, _notificationService, _contextKeyService, _themeService, _contextMenuService, _accessibilityService) {
-        super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: _options?.draggable, keybinding: _options?.keybinding, hoverDelegate: _options?.hoverDelegate });
+        super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: _options?.draggable, keybinding: _options?.keybinding, hoverDelegate: _options?.hoverDelegate, keybindingNotRenderedWithLabel: _options?.keybindingNotRenderedWithLabel });
         this._options = _options;
         this._keybindingService = _keybindingService;
         this._notificationService = _notificationService;
@@ -184,17 +184,17 @@ let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewIt
         const keybindingLabel = keybinding && keybinding.getLabel();
         const tooltip = this._commandAction.tooltip || this._commandAction.label;
         let title = keybindingLabel
-            ? ( localize(1610, "{0} ({1})", tooltip, keybindingLabel))
+            ? ( localize(1646, "{0} ({1})", tooltip, keybindingLabel))
             : tooltip;
         if (!this._wantsAltCommand && this._menuItemAction.alt?.enabled) {
             const altTooltip = this._menuItemAction.alt.tooltip || this._menuItemAction.alt.label;
             const altKeybinding = this._keybindingService.lookupKeybinding(this._menuItemAction.alt.id, this._contextKeyService);
             const altKeybindingLabel = altKeybinding && altKeybinding.getLabel();
             const altTitleSection = altKeybindingLabel
-                ? ( localize(1610, "{0} ({1})", altTooltip, altKeybindingLabel))
+                ? ( localize(1646, "{0} ({1})", altTooltip, altKeybindingLabel))
                 : altTooltip;
             title = ( localize(
-                1611,
+                1647,
                 "{0}\n[{1}] {2}",
                 title,
                 UILabelProvider.modifierLabels[OS].altKey,
@@ -270,10 +270,10 @@ class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem {
         if (this.label) {
             const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
             if (this._options?.conversational) {
-                this.label.textContent = ( localize(1612, '{1} to {0}', this._action.label, kb2));
+                this.label.textContent = ( localize(1648, '{1} to {0}', this._action.label, kb2));
             }
             else {
-                this.label.textContent = ( localize(1613, '{0} ({1})', this._action.label, kb2));
+                this.label.textContent = ( localize(1649, '{0} ({1})', this._action.label, kb2));
             }
         }
     }

package/vscode/src/vs/platform/actions/browser/toolbar.js

@@ -144,7 +144,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     else {
                         primaryActions.push(toAction({
                             id: 'label',
-                            label: ( localize(1614, "Hide")),
+                            label: ( localize(1650, "Hide")),
                             enabled: false,
                             run() { }
                         }));
@@ -158,7 +158,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     actions.push(( new Separator()));
                     actions.push(toAction({
                         id: 'resetThisMenu',
-                        label: ( localize(1615, "Reset Menu")),
+                        label: ( localize(1651, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }

package/vscode/src/vs/platform/actions/common/actions.d.ts

@@ -88,13 +88,13 @@ export declare class MenuId {
     static readonly MenubarSwitchEditorMenu: MenuId;
     static readonly MenubarSwitchGroupMenu: MenuId;
     static readonly MenubarTerminalMenu: MenuId;
+    static readonly MenubarTerminalSuggestStatusMenu: MenuId;
     static readonly MenubarViewMenu: MenuId;
     static readonly MenubarHomeMenu: MenuId;
     static readonly OpenEditorsContext: MenuId;
     static readonly OpenEditorsContextShare: MenuId;
     static readonly ProblemsPanelContext: MenuId;
     static readonly SCMInputBox: MenuId;
-    static readonly SCMChangesContext: MenuId;
     static readonly SCMChangeContext: MenuId;
     static readonly SCMResourceContext: MenuId;
     static readonly SCMResourceContextShare: MenuId;
@@ -104,6 +104,8 @@ export declare class MenuId {
     static readonly SCMSourceControlInline: MenuId;
     static readonly SCMSourceControlTitle: MenuId;
     static readonly SCMHistoryTitle: MenuId;
+    static readonly SCMHistoryItemContext: MenuId;
+    static readonly SCMHistoryItemHover: MenuId;
     static readonly SCMHistoryItemRefContext: MenuId;
     static readonly SCMTitle: MenuId;
     static readonly SearchContext: MenuId;
@@ -119,6 +121,7 @@ export declare class MenuId {
     static readonly TestPeekElement: MenuId;
     static readonly TestPeekTitle: MenuId;
     static readonly TestCallStack: MenuId;
+    static readonly TestCoverageFilterItem: MenuId;
     static readonly TouchBarContext: MenuId;
     static readonly TitleBarContext: MenuId;
     static readonly TitleBarTitleContext: MenuId;

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { SubmenuAction } from '../../../base/common/actions.js';
 import { MicrotaskEmitter } from '../../../base/common/event.js';
-import { toDisposable, DisposableStore, dispose } from '../../../base/common/lifecycle.js';
+import { markAsSingleton, toDisposable, DisposableStore, dispose } from '../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../base/common/linkedList.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { CommandsRegistry } from '../../commands/common/commands.js';
@@ -78,13 +78,13 @@ class MenuId {
     static { this.MenubarSwitchEditorMenu = ( new MenuId('MenubarSwitchEditorMenu')); }
     static { this.MenubarSwitchGroupMenu = ( new MenuId('MenubarSwitchGroupMenu')); }
     static { this.MenubarTerminalMenu = ( new MenuId('MenubarTerminalMenu')); }
+    static { this.MenubarTerminalSuggestStatusMenu = ( new MenuId('MenubarTerminalSuggestStatusMenu')); }
     static { this.MenubarViewMenu = ( new MenuId('MenubarViewMenu')); }
     static { this.MenubarHomeMenu = ( new MenuId('MenubarHomeMenu')); }
     static { this.OpenEditorsContext = ( new MenuId('OpenEditorsContext')); }
     static { this.OpenEditorsContextShare = ( new MenuId('OpenEditorsContextShare')); }
     static { this.ProblemsPanelContext = ( new MenuId('ProblemsPanelContext')); }
     static { this.SCMInputBox = ( new MenuId('SCMInputBox')); }
-    static { this.SCMChangesContext = ( new MenuId('SCMChangesContext')); }
     static { this.SCMChangeContext = ( new MenuId('SCMChangeContext')); }
     static { this.SCMResourceContext = ( new MenuId('SCMResourceContext')); }
     static { this.SCMResourceContextShare = ( new MenuId('SCMResourceContextShare')); }
@@ -94,6 +94,8 @@ class MenuId {
     static { this.SCMSourceControlInline = ( new MenuId('SCMSourceControlInline')); }
     static { this.SCMSourceControlTitle = ( new MenuId('SCMSourceControlTitle')); }
     static { this.SCMHistoryTitle = ( new MenuId('SCMHistoryTitle')); }
+    static { this.SCMHistoryItemContext = ( new MenuId('SCMHistoryItemContext')); }
+    static { this.SCMHistoryItemHover = ( new MenuId('SCMHistoryItemHover')); }
     static { this.SCMHistoryItemRefContext = ( new MenuId('SCMHistoryItemRefContext')); }
     static { this.SCMTitle = ( new MenuId('SCMTitle')); }
     static { this.SearchContext = ( new MenuId('SearchContext')); }
@@ -109,6 +111,7 @@ class MenuId {
     static { this.TestPeekElement = ( new MenuId('TestPeekElement')); }
     static { this.TestPeekTitle = ( new MenuId('TestPeekTitle')); }
     static { this.TestCallStack = ( new MenuId('TestCallStack')); }
+    static { this.TestCoverageFilterItem = ( new MenuId('TestCoverageFilterItem')); }
     static { this.TouchBarContext = ( new MenuId('TouchBarContext')); }
     static { this.TitleBarContext = ( new MenuId('TitleBarContext')); }
     static { this.TitleBarTitleContext = ( new MenuId('TitleBarTitleContext')); }
@@ -260,11 +263,11 @@ const MenuRegistry = new (class {
     addCommand(command) {
         this._commands.set(command.id, command);
         this._onDidChangeMenu.fire(MenuRegistryChangeEvent.for(MenuId.CommandPalette));
-        return toDisposable(() => {
+        return markAsSingleton(toDisposable(() => {
             if (this._commands.delete(command.id)) {
                 this._onDidChangeMenu.fire(MenuRegistryChangeEvent.for(MenuId.CommandPalette));
             }
-        });
+        }));
     }
     getCommand(id) {
         return this._commands.get(id);
@@ -282,10 +285,10 @@ const MenuRegistry = new (class {
         }
         const rm = list.push(item);
         this._onDidChangeMenu.fire(MenuRegistryChangeEvent.for(id));
-        return toDisposable(() => {
+        return markAsSingleton(toDisposable(() => {
             rm();
             this._onDidChangeMenu.fire(MenuRegistryChangeEvent.for(id));
-        });
+        }));
     }
     appendMenuItems(items) {
         const result = ( new DisposableStore());

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

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(1616, "Reset All Menus")),
+            title: ( localize2(1652, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });

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

@@ -408,7 +408,7 @@ function createMenuHide(menu, command, states) {
     const title = typeof command.title === 'string' ? command.title : command.title.value;
     const hide = toAction({
         id: `hide/${menu.id}/${id}`,
-        label: ( localize(1617, 'Hide \'{0}\'', title)),
+        label: ( localize(1653, 'Hide \'{0}\'', title)),
         run() { states.updateHidden(menu, id, true); }
     });
     const toggle = toAction({
@@ -426,7 +426,7 @@ function createMenuHide(menu, command, states) {
 function createConfigureKeybindingAction(commandService, keybindingService, commandId, when = undefined, enabled = true) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
-        label: ( localize(1618, "Configure Keybinding")),
+        label: ( localize(1654, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

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

@@ -1,7 +1,7 @@
 
 import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
-import { toDisposable } from '../../../base/common/lifecycle.js';
+import { toDisposable, markAsSingleton } from '../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../base/common/linkedList.js';
 import { validateConstraints } from '../../../base/common/types.js';
 import { ICommandService } from './commands.service.js';
@@ -48,7 +48,7 @@ const CommandsRegistry = new (class {
             }
         });
         this._onDidRegisterCommand.fire(id);
-        return ret;
+        return markAsSingleton(ret);
     }
     registerCommandAlias(oldId, newId) {
         return CommandsRegistry.registerCommand(oldId, (accessor, ...args) => accessor.get(ICommandService).executeCommand(newId, ...args));

package/vscode/src/vs/platform/configuration/common/configuration.d.ts

@@ -1,3 +1,4 @@
+import { IStringDictionary } from "../../../base/common/collections.js";
 import { URI, UriComponents } from "../../../base/common/uri.js";
 export declare function isConfigurationOverrides(thing: any): thing is IConfigurationOverrides;
 export interface IConfigurationOverrides {
@@ -75,6 +76,7 @@ export interface IConfigurationModel {
     contents: any;
     keys: string[];
     overrides: IOverrides[];
+    raw?: IStringDictionary<any>;
 }
 export interface IOverrides {
     keys: string[];
@@ -85,7 +87,8 @@ export interface IConfigurationData {
     defaults: IConfigurationModel;
     policy: IConfigurationModel;
     application: IConfigurationModel;
-    user: IConfigurationModel;
+    userLocal: IConfigurationModel;
+    userRemote: IConfigurationModel;
     workspace: IConfigurationModel;
     folders: [
         UriComponents,

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

@@ -92,6 +92,9 @@ function removeFromValueTree(valueTree, key) {
     doRemoveFromValueTree(valueTree, segments);
 }
 function doRemoveFromValueTree(valueTree, segments) {
+    if (!valueTree) {
+        return;
+    }
     const first = segments.shift();
     if (segments.length === 0) {
         delete valueTree[first];

package/vscode/src/vs/platform/configuration/common/configurationModels.d.ts

@@ -16,11 +16,11 @@ export declare class ConfigurationModel implements IConfigurationModel {
     private readonly _contents;
     private readonly _keys;
     private readonly _overrides;
-    readonly raw: ReadonlyArray<IStringDictionary<any> | ConfigurationModel> | undefined;
+    readonly raw: IStringDictionary<any> | ReadonlyArray<IStringDictionary<any> | ConfigurationModel> | undefined;
     private readonly logService;
     static createEmptyModel(logService: ILogService): ConfigurationModel;
     private readonly overrideConfigurations;
-    constructor(_contents: any, _keys: string[], _overrides: IOverrides[], raw: ReadonlyArray<IStringDictionary<any> | ConfigurationModel> | undefined, logService: ILogService);
+    constructor(_contents: any, _keys: string[], _overrides: IOverrides[], raw: IStringDictionary<any> | ReadonlyArray<IStringDictionary<any> | ConfigurationModel> | undefined, logService: ILogService);
     private _rawConfiguration;
     get rawConfiguration(): ConfigurationModel;
     get contents(): any;

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

@@ -29,8 +29,8 @@ class ConfigurationModel {
     }
     get rawConfiguration() {
         if (!this._rawConfiguration) {
-            if (this.raw?.length) {
-                const rawConfigurationModels = ( this.raw.map(raw => {
+            if (this.raw) {
+                const rawConfigurationModels = ( (Array.isArray(this.raw) ? this.raw : [this.raw]).map(raw => {
                     if (raw instanceof ConfigurationModel) {
                         return raw;
                     }
@@ -119,9 +119,9 @@ class ConfigurationModel {
         const contents = deepClone(this.contents);
         const overrides = deepClone(this.overrides);
         const keys = [...this.keys];
-        const raws = this.raw?.length ? [...this.raw] : [this];
+        const raws = this.raw ? Array.isArray(this.raw) ? [...this.raw] : [this.raw] : [this];
         for (const other of others) {
-            raws.push(...(other.raw?.length ? other.raw : [other]));
+            raws.push(...(other.raw ? Array.isArray(other.raw) ? other.raw : [other.raw] : [other]));
             if (other.isEmpty()) {
                 continue;
             }
@@ -147,7 +147,7 @@ class ConfigurationModel {
             contents,
             keys,
             overrides,
-            raws.every(raw => raw instanceof ConfigurationModel) ? undefined : raws,
+            !raws.length || raws.every(raw => raw instanceof ConfigurationModel) ? undefined : raws,
             this.logService
         ));
     }
@@ -607,7 +607,7 @@ let Configuration$1 = class Configuration {
         this._userConfiguration = null;
     }
     getValue(section, overrides, workspace) {
-        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(section, overrides, workspace);
+        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(overrides, workspace);
         return consolidateConfigurationModel.getValue(section);
     }
     updateValue(key, value, overrides = {}) {
@@ -633,7 +633,7 @@ let Configuration$1 = class Configuration {
         }
     }
     inspect(key, overrides, workspace) {
-        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(key, overrides, workspace);
+        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(overrides, workspace);
         const folderConfigurationModel = this.getFolderConfigurationModelForResource(overrides.resource, workspace);
         const memoryConfigurationModel = overrides.resource ? this._memoryConfigurationByResource.get(overrides.resource) || this._memoryConfiguration : this._memoryConfiguration;
         const overrideIdentifiers = ( new Set());
@@ -794,7 +794,13 @@ let Configuration$1 = class Configuration {
     }
     get userConfiguration() {
         if (!this._userConfiguration) {
-            this._userConfiguration = this._remoteUserConfiguration.isEmpty() ? this._localUserConfiguration : this._localUserConfiguration.merge(this._remoteUserConfiguration);
+            if (this._remoteUserConfiguration.isEmpty()) {
+                this._userConfiguration = this._localUserConfiguration;
+            }
+            else {
+                const merged = this._localUserConfiguration.merge(this._remoteUserConfiguration);
+                this._userConfiguration = ( new ConfigurationModel(merged.contents, merged.keys, merged.overrides, undefined, this.logService));
+            }
         }
         return this._userConfiguration;
     }
@@ -810,13 +816,16 @@ let Configuration$1 = class Configuration {
     get folderConfigurations() {
         return this._folderConfigurations;
     }
-    getConsolidatedConfigurationModel(section, overrides, workspace) {
+    getConsolidatedConfigurationModel(overrides, workspace) {
         let configurationModel = this.getConsolidatedConfigurationModelForResource(overrides, workspace);
         if (overrides.overrideIdentifier) {
             configurationModel = configurationModel.override(overrides.overrideIdentifier);
         }
-        if (!this._policyConfiguration.isEmpty() && this._policyConfiguration.getValue(section) !== undefined) {
-            configurationModel = configurationModel.merge(this._policyConfiguration);
+        if (!this._policyConfiguration.isEmpty()) {
+            configurationModel = configurationModel.merge();
+            for (const key of this._policyConfiguration.keys) {
+                configurationModel.setValue(key, this._policyConfiguration.getValue(key));
+            }
         }
         return configurationModel;
     }
@@ -869,7 +878,7 @@ let Configuration$1 = class Configuration {
             defaults: {
                 contents: this._defaultConfiguration.contents,
                 overrides: this._defaultConfiguration.overrides,
-                keys: this._defaultConfiguration.keys
+                keys: this._defaultConfiguration.keys,
             },
             policy: {
                 contents: this._policyConfiguration.contents,
@@ -879,12 +888,20 @@ let Configuration$1 = class Configuration {
             application: {
                 contents: this.applicationConfiguration.contents,
                 overrides: this.applicationConfiguration.overrides,
-                keys: this.applicationConfiguration.keys
+                keys: this.applicationConfiguration.keys,
+                raw: Array.isArray(this.applicationConfiguration.raw) ? undefined : this.applicationConfiguration.raw
+            },
+            userLocal: {
+                contents: this.localUserConfiguration.contents,
+                overrides: this.localUserConfiguration.overrides,
+                keys: this.localUserConfiguration.keys,
+                raw: Array.isArray(this.localUserConfiguration.raw) ? undefined : this.localUserConfiguration.raw
             },
-            user: {
-                contents: this.userConfiguration.contents,
-                overrides: this.userConfiguration.overrides,
-                keys: this.userConfiguration.keys
+            userRemote: {
+                contents: this.remoteUserConfiguration.contents,
+                overrides: this.remoteUserConfiguration.overrides,
+                keys: this.remoteUserConfiguration.keys,
+                raw: Array.isArray(this.remoteUserConfiguration.raw) ? undefined : this.remoteUserConfiguration.raw
             },
             workspace: {
                 contents: this._workspaceConfiguration.contents,
@@ -926,7 +943,8 @@ let Configuration$1 = class Configuration {
         const defaultConfiguration = this.parseConfigurationModel(data.defaults, logService);
         const policyConfiguration = this.parseConfigurationModel(data.policy, logService);
         const applicationConfiguration = this.parseConfigurationModel(data.application, logService);
-        const userConfiguration = this.parseConfigurationModel(data.user, logService);
+        const userLocalConfiguration = this.parseConfigurationModel(data.userLocal, logService);
+        const userRemoteConfiguration = this.parseConfigurationModel(data.userRemote, logService);
         const workspaceConfiguration = this.parseConfigurationModel(data.workspace, logService);
         const folders = data.folders.reduce((result, value) => {
             result.set(URI.revive(value[0]), this.parseConfigurationModel(value[1], logService));
@@ -936,8 +954,8 @@ let Configuration$1 = class Configuration {
             defaultConfiguration,
             policyConfiguration,
             applicationConfiguration,
-            userConfiguration,
-            ConfigurationModel.createEmptyModel(logService),
+            userLocalConfiguration,
+            userRemoteConfiguration,
             workspaceConfiguration,
             folders,
             ConfigurationModel.createEmptyModel(logService),
@@ -946,7 +964,7 @@ let Configuration$1 = class Configuration {
         ));
     }
     static parseConfigurationModel(model, logService) {
-        return ( new ConfigurationModel(model.contents, model.keys, model.overrides, undefined, logService));
+        return ( new ConfigurationModel(model.contents, model.keys, model.overrides, model.raw, logService));
     }
 };
 function mergeChanges(...changes) {

package/vscode/src/vs/platform/configuration/common/configurationRegistry.d.ts

@@ -43,10 +43,11 @@ export interface IConfigurationRegistry {
 export declare enum ConfigurationScope {
     APPLICATION = 1,
     MACHINE = 2,
-    WINDOW = 3,
-    RESOURCE = 4,
-    LANGUAGE_OVERRIDABLE = 5,
-    MACHINE_OVERRIDABLE = 6
+    APPLICATION_MACHINE = 3,
+    WINDOW = 4,
+    RESOURCE = 5,
+    LANGUAGE_OVERRIDABLE = 6,
+    MACHINE_OVERRIDABLE = 7
 }
 export interface IPolicy {
     readonly name: PolicyName;
@@ -107,6 +108,10 @@ export declare const applicationSettings: {
     properties: IStringDictionary<IConfigurationPropertySchema>;
     patternProperties: IStringDictionary<IConfigurationPropertySchema>;
 };
+export declare const applicationMachineSettings: {
+    properties: IStringDictionary<IConfigurationPropertySchema>;
+    patternProperties: IStringDictionary<IConfigurationPropertySchema>;
+};
 export declare const machineSettings: {
     properties: IStringDictionary<IConfigurationPropertySchema>;
     patternProperties: IStringDictionary<IConfigurationPropertySchema>;

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

@@ -19,13 +19,15 @@ var ConfigurationScope;
 (function (ConfigurationScope) {
     ConfigurationScope[ConfigurationScope["APPLICATION"] = 1] = "APPLICATION";
     ConfigurationScope[ConfigurationScope["MACHINE"] = 2] = "MACHINE";
-    ConfigurationScope[ConfigurationScope["WINDOW"] = 3] = "WINDOW";
-    ConfigurationScope[ConfigurationScope["RESOURCE"] = 4] = "RESOURCE";
-    ConfigurationScope[ConfigurationScope["LANGUAGE_OVERRIDABLE"] = 5] = "LANGUAGE_OVERRIDABLE";
-    ConfigurationScope[ConfigurationScope["MACHINE_OVERRIDABLE"] = 6] = "MACHINE_OVERRIDABLE";
+    ConfigurationScope[ConfigurationScope["APPLICATION_MACHINE"] = 3] = "APPLICATION_MACHINE";
+    ConfigurationScope[ConfigurationScope["WINDOW"] = 4] = "WINDOW";
+    ConfigurationScope[ConfigurationScope["RESOURCE"] = 5] = "RESOURCE";
+    ConfigurationScope[ConfigurationScope["LANGUAGE_OVERRIDABLE"] = 6] = "LANGUAGE_OVERRIDABLE";
+    ConfigurationScope[ConfigurationScope["MACHINE_OVERRIDABLE"] = 7] = "MACHINE_OVERRIDABLE";
 })(ConfigurationScope || (ConfigurationScope = {}));
 const allSettings = { properties: {}, patternProperties: {} };
 const applicationSettings = { properties: {}, patternProperties: {} };
+const applicationMachineSettings = { properties: {}, patternProperties: {} };
 const machineSettings = { properties: {}, patternProperties: {} };
 const machineOverridableSettings = { properties: {}, patternProperties: {} };
 const windowSettings = { properties: {}, patternProperties: {} };
@@ -44,7 +46,7 @@ class ConfigurationRegistry {
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: 'defaultOverrides',
-            title: ( localize(1619, "Default Language Configuration Overrides")),
+            title: ( localize(1655, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -192,7 +194,7 @@ class ConfigurationRegistry {
             type: 'object',
             default: newDefaultOverride.value,
             description: ( localize(
-                1620,
+                1656,
                 "Configure settings to be overridden for the {0} language.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -410,6 +412,9 @@ class ConfigurationRegistry {
             case ConfigurationScope.MACHINE:
                 machineSettings.properties[key] = property;
                 break;
+            case ConfigurationScope.APPLICATION_MACHINE:
+                applicationMachineSettings.properties[key] = property;
+                break;
             case ConfigurationScope.MACHINE_OVERRIDABLE:
                 machineOverridableSettings.properties[key] = property;
                 break;
@@ -434,6 +439,9 @@ class ConfigurationRegistry {
             case ConfigurationScope.MACHINE:
                 delete machineSettings.properties[key];
                 break;
+            case ConfigurationScope.APPLICATION_MACHINE:
+                delete applicationMachineSettings.properties[key];
+                break;
             case ConfigurationScope.MACHINE_OVERRIDABLE:
                 delete machineOverridableSettings.properties[key];
                 break;
@@ -452,13 +460,14 @@ class ConfigurationRegistry {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: 'object',
-                description: ( localize(1621, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(1622, "This setting does not support per-language configuration.")),
+                description: ( localize(1657, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(1658, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId,
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
             allSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
             applicationSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
+            applicationMachineSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
             machineSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
             machineOverridableSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
             windowSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
@@ -468,12 +477,13 @@ class ConfigurationRegistry {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: 'object',
-            description: ( localize(1621, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(1622, "This setting does not support per-language configuration.")),
+            description: ( localize(1657, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(1658, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId,
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
         applicationSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
+        applicationMachineSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
         machineSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
         machineOverridableSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
         windowSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -544,25 +554,25 @@ const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
 function validateProperty(property, schema) {
     if (!property.trim()) {
-        return localize(1623, "Cannot register an empty property");
+        return localize(1659, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            1624,
+            1660,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
     if (configurationRegistry.getConfigurationProperties()[property] !== undefined) {
         return localize(
-            1625,
+            1661,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            1626,
+            1662,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}.",
             property,
             schema.policy?.name,
@@ -613,4 +623,4 @@ function parseScope(scope) {
     }
 }
 
-export { ConfigurationScope, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };
+export { ConfigurationScope, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationMachineSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };

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

@@ -487,7 +487,7 @@ CommandsRegistry.registerCommand({
         return [...RawContextKey.all()].sort((a, b) => a.key.localeCompare(b.key));
     },
     metadata: {
-        description: ( localize(1627, "A command that returns information about context keys")),
+        description: ( localize(1663, "A command that returns information about context keys")),
         args: []
     }
 });

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

@@ -47,17 +47,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1628, "Empty context key expression"));
+const errorEmptyString = ( localize(1664, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1629,
+    1665,
     "Did you forget to write an expression? You can also put 'false' or 'true' to always evaluate to false or true, respectively."
 ));
-const errorNoInAfterNot = ( localize(1630, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1631, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1632, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1633, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1634, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1635, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(1666, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(1667, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(1668, "Unexpected token"));
+const hintUnexpectedToken = ( localize(1669, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(1670, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(1671, "Did you forget to put a context key?"));
 class Parser {
     static { this._parseError = ( new Error()); }
     get lexingErrors() {
@@ -369,7 +369,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(1636, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(1672, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({ message, offset, lexeme, additionalInfo });
@@ -447,8 +447,8 @@ function validateWhenClauses(whenClauses) {
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map((se) => ({
                 errorMessage: se.additionalInfo ?
-                    ( localize(1637, "Unexpected token. Hint: {0}", se.additionalInfo)) :
-                    ( localize(1638, "Unexpected token.")),
+                    ( localize(1673, "Unexpected token. Hint: {0}", se.additionalInfo)) :
+                    ( localize(1674, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length,
             })));