@codingame/monaco-vscode-api 15.0.2 → 16.0.0

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

@@ -0,0 +1,49 @@
+.monaco-action-bar .action-item.menu-entry .action-label.icon {
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	background-position: 50%;
+	background-size: 16px;
+}
+.monaco-action-bar .action-item.menu-entry.text-only .action-label {
+	color: var(--vscode-descriptionForeground);
+	overflow: hidden;
+	border-radius: 2px;
+}
+.monaco-action-bar .action-item.menu-entry.text-only.use-comma:not(:last-of-type) .action-label::after {
+	content: ', ';
+}
+.monaco-action-bar .action-item.menu-entry.text-only + .action-item:not(.text-only) > .monaco-dropdown .action-label {
+	color: var(--vscode-descriptionForeground);
+}
+.monaco-dropdown-with-default {
+	display: flex !important;
+	flex-direction: row;
+	border-radius: 5px;
+}
+.monaco-dropdown-with-default > .action-container > .action-label {
+	margin-right: 0;
+}
+.monaco-dropdown-with-default > .action-container.menu-entry > .action-label.icon {
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	background-position: 50%;
+	background-size: 16px;
+}
+.monaco-dropdown-with-default:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+.monaco-dropdown-with-default > .dropdown-action-container > .monaco-dropdown > .dropdown-label .codicon[class*='codicon-'] {
+	font-size: 12px;
+	padding-left: 0px;
+	padding-right: 0px;
+	line-height: 16px;
+	margin-left: -3px;
+}
+.monaco-dropdown-with-default > .dropdown-action-container > .monaco-dropdown > .dropdown-label > .action-label {
+	display: block;
+	background-size: 16px;
+	background-position: center center;
+	background-repeat: no-repeat;
+}

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.d.ts

@@ -39,7 +39,7 @@ export declare function fillInActionBarActions(groups: [
 ][], target: IAction[] | PrimaryAndSecondaryActions, primaryGroup?: string | ((actionGroup: string) => boolean), shouldInlineSubmenu?: (action: SubmenuAction, group: string, groupSize: number) => boolean, useSeparatorsInPrimaryActions?: boolean): void;
 export interface IMenuEntryActionViewItemOptions {
     draggable?: boolean;
-    keybinding?: string;
+    keybinding?: string | null;
     hoverDelegate?: IHoverDelegate;
     keybindingNotRenderedWithLabel?: boolean;
 }

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

@@ -38,7 +38,7 @@ import { isDark } from '../../theme/common/theme.js';
 import { IThemeService } from '../../theme/common/themeService.service.js';
 import { MenuItemAction, SubmenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
-import './menuEntryActionViewItem.css.js';
+import './menuEntryActionViewItem.css';
 
 function getContextMenuActions(groups, primaryGroup) {
     const target = { primary: [], secondary: [] };
@@ -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(1665, "{0} ({1})", tooltip, keybindingLabel))
+            ? ( localize(1700, "{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(1665, "{0} ({1})", altTooltip, altKeybindingLabel))
+                ? ( localize(1700, "{0} ({1})", altTooltip, altKeybindingLabel))
                 : altTooltip;
             title = ( localize(
-                1666,
+                1701,
                 "{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(1667, '{1} to {0}', this._action.label, kb2));
+                this.label.textContent = ( localize(1702, '{1} to {0}', this._action.label, kb2));
             }
             else {
-                this.label.textContent = ( localize(1668, '{0} ({1})', this._action.label, kb2));
+                this.label.textContent = ( localize(1703, '{0} ({1})', this._action.label, kb2));
             }
         }
     }
@@ -347,7 +347,7 @@ let DropdownWithDefaultActionViewItem = class DropdownWithDefaultActionViewItem
         if (!defaultAction) {
             defaultAction = submenuAction.actions[0];
         }
-        this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, defaultAction, { keybinding: this._getDefaultActionKeybindingLabel(defaultAction) });
+        this._defaultAction = this._defaultActionDisposables.add(this._instaService.createInstance(MenuEntryActionViewItem, defaultAction, { keybinding: this._getDefaultActionKeybindingLabel(defaultAction) }));
         const dropdownOptions = {
             keybindingProvider: action => this._keybindingService.lookupKeybinding(action.id),
             ...options,

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(1669, "Hide")),
+                            label: ( localize(1704, "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(1670, "Reset Menu")),
+                        label: ( localize(1705, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }

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

@@ -211,6 +211,7 @@ export declare class MenuId {
     static readonly ChatExecuteSecondary: MenuId;
     static readonly ChatInput: MenuId;
     static readonly ChatInputSide: MenuId;
+    static readonly ChatModelPicker: MenuId;
     static readonly ChatEditingWidgetToolbar: MenuId;
     static readonly ChatEditingEditorContent: MenuId;
     static readonly ChatEditingEditorHunk: MenuId;

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

@@ -201,6 +201,7 @@ class MenuId {
     static { this.ChatExecuteSecondary = ( new MenuId('ChatExecuteSecondary')); }
     static { this.ChatInput = ( new MenuId('ChatInput')); }
     static { this.ChatInputSide = ( new MenuId('ChatInputSide')); }
+    static { this.ChatModelPicker = ( new MenuId('ChatModelPicker')); }
     static { this.ChatEditingWidgetToolbar = ( new MenuId('ChatEditingWidgetToolbar')); }
     static { this.ChatEditingEditorContent = ( new MenuId('ChatEditingEditorContent')); }
     static { this.ChatEditingEditorHunk = ( new MenuId('ChatEditingEditorHunk')); }

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

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(1671, "Reset All Menus")),
+            title: ( localize2(1706, "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(1672, 'Hide \'{0}\'', title)),
+        label: ( localize(1707, '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(1673, "Configure Keybinding")),
+        label: ( localize(1708, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

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

@@ -65,6 +65,7 @@ export interface IConfigurationValue<T> {
     };
     readonly overrideIdentifiers?: string[];
 }
+export declare function getConfigValueInTarget<T>(configValue: IConfigurationValue<T>, scope: ConfigurationTarget): T | undefined;
 export declare function isConfigured<T>(configValue: IConfigurationValue<T>): configValue is IConfigurationValue<T> & {
     value: T;
 };

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

@@ -1,4 +1,5 @@
 
+import { assertNever } from '../../../base/common/assert.js';
 import { URI } from '../../../base/common/uri.js';
 
 function isConfigurationOverrides(thing) {
@@ -37,6 +38,28 @@ function ConfigurationTargetToString(configurationTarget) {
         case ConfigurationTarget.MEMORY: return 'MEMORY';
     }
 }
+function getConfigValueInTarget(configValue, scope) {
+    switch (scope) {
+        case ConfigurationTarget.APPLICATION:
+            return configValue.applicationValue;
+        case ConfigurationTarget.USER:
+            return configValue.userValue;
+        case ConfigurationTarget.USER_LOCAL:
+            return configValue.userLocalValue;
+        case ConfigurationTarget.USER_REMOTE:
+            return configValue.userRemoteValue;
+        case ConfigurationTarget.WORKSPACE:
+            return configValue.workspaceValue;
+        case ConfigurationTarget.WORKSPACE_FOLDER:
+            return configValue.workspaceFolderValue;
+        case ConfigurationTarget.DEFAULT:
+            return configValue.defaultValue;
+        case ConfigurationTarget.MEMORY:
+            return configValue.memoryValue;
+        default:
+            assertNever();
+    }
+}
 function isConfigured(configValue) {
     return configValue.applicationValue !== undefined ||
         configValue.userValue !== undefined ||
@@ -129,4 +152,4 @@ function getLanguageTagSettingPlainKey(settingKey) {
     return settingKey.replace(/[\[\]]/g, '');
 }
 
-export { ConfigurationTarget, ConfigurationTargetToString, addToValueTree, getConfigurationValue, getLanguageTagSettingPlainKey, isConfigurationOverrides, isConfigurationUpdateOverrides, isConfigured, removeFromValueTree, toValuesTree };
+export { ConfigurationTarget, ConfigurationTargetToString, addToValueTree, getConfigValueInTarget, getConfigurationValue, getLanguageTagSettingPlainKey, isConfigurationOverrides, isConfigurationUpdateOverrides, isConfigured, removeFromValueTree, toValuesTree };

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

@@ -607,7 +607,7 @@ let Configuration$1 = class Configuration {
         this._userConfiguration = null;
     }
     getValue(section, overrides, workspace) {
-        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(overrides, workspace);
+        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(section, 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(overrides, workspace);
+        const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(key, 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());
@@ -816,12 +816,12 @@ let Configuration$1 = class Configuration {
     get folderConfigurations() {
         return this._folderConfigurations;
     }
-    getConsolidatedConfigurationModel(overrides, workspace) {
+    getConsolidatedConfigurationModel(section, overrides, workspace) {
         let configurationModel = this.getConsolidatedConfigurationModelForResource(overrides, workspace);
         if (overrides.overrideIdentifier) {
             configurationModel = configurationModel.override(overrides.overrideIdentifier);
         }
-        if (!this._policyConfiguration.isEmpty()) {
+        if (!this._policyConfiguration.isEmpty() && this._policyConfiguration.getValue(section) !== undefined) {
             configurationModel = configurationModel.merge();
             for (const key of this._policyConfiguration.keys) {
                 configurationModel.setValue(key, this._policyConfiguration.getValue(key));

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

@@ -1,7 +1,7 @@
 import { IStringDictionary } from "../../../base/common/collections.js";
 import { Event } from "../../../base/common/event.js";
 import { IJSONSchema } from "../../../base/common/jsonSchema.js";
-import { PolicyName } from "../../policy/common/policy.js";
+import { IPolicy, PolicyName } from "../../../base/common/policy.js";
 export declare enum EditPresentationTypes {
     Multiline = "multilineText",
     Singleline = "singlelineText"
@@ -16,7 +16,7 @@ export interface IConfigurationDelta {
     addedConfigurations?: IConfigurationNode[];
 }
 export interface IConfigurationRegistry {
-    registerConfiguration(configuration: IConfigurationNode): void;
+    registerConfiguration(configuration: IConfigurationNode): IConfigurationNode;
     registerConfigurations(configurations: IConfigurationNode[], validate?: boolean): void;
     deregisterConfigurations(configurations: IConfigurationNode[]): void;
     updateConfigurations(configurations: {
@@ -49,10 +49,6 @@ export declare enum ConfigurationScope {
     LANGUAGE_OVERRIDABLE = 6,
     MACHINE_OVERRIDABLE = 7
 }
-export interface IPolicy {
-    readonly name: PolicyName;
-    readonly minimumVersion: `${number}.${number}`;
-}
 export interface IConfigurationPropertySchema extends IJSONSchema {
     scope?: ConfigurationScope;
     restricted?: boolean;

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

@@ -46,7 +46,7 @@ class ConfigurationRegistry {
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: 'defaultOverrides',
-            title: ( localize(1674, "Default Language Configuration Overrides")),
+            title: ( localize(1709, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -65,6 +65,7 @@ class ConfigurationRegistry {
     }
     registerConfiguration(configuration, validate = true) {
         this.registerConfigurations([configuration], validate);
+        return configuration;
     }
     registerConfigurations(configurations, validate = true) {
         const properties = ( new Set());
@@ -194,7 +195,7 @@ class ConfigurationRegistry {
             type: 'object',
             default: newDefaultOverride.value,
             description: ( localize(
-                1675,
+                1710,
                 "Configure settings to be overridden for the {0} language.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -342,21 +343,26 @@ class ConfigurationRegistry {
                     property.scope = isUndefinedOrNull(property.scope) ? scope : property.scope;
                     property.restricted = isUndefinedOrNull(property.restricted) ? !!restrictedProperties?.includes(key) : property.restricted;
                 }
-                if (properties[key].hasOwnProperty('included') && !properties[key].included) {
+                const excluded = properties[key].hasOwnProperty('included') && !properties[key].included;
+                const policyName = properties[key].policy?.name;
+                if (excluded) {
                     this.excludedConfigurationProperties[key] = properties[key];
+                    if (policyName) {
+                        this.policyConfigurations.set(policyName, key);
+                        bucket.add(key);
+                    }
                     delete properties[key];
-                    continue;
                 }
                 else {
+                    bucket.add(key);
+                    if (policyName) {
+                        this.policyConfigurations.set(policyName, key);
+                    }
                     this.configurationProperties[key] = properties[key];
-                    if (properties[key].policy?.name) {
-                        this.policyConfigurations.set(properties[key].policy.name, key);
+                    if (!properties[key].deprecationMessage && properties[key].markdownDeprecationMessage) {
+                        properties[key].deprecationMessage = properties[key].markdownDeprecationMessage;
                     }
                 }
-                if (!properties[key].deprecationMessage && properties[key].markdownDeprecationMessage) {
-                    properties[key].deprecationMessage = properties[key].markdownDeprecationMessage;
-                }
-                bucket.add(key);
             }
         }
         const subNodes = configuration.allOf;
@@ -460,8 +466,8 @@ class ConfigurationRegistry {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: 'object',
-                description: ( localize(1676, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(1677, "This setting does not support per-language configuration.")),
+                description: ( localize(1711, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(1712, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId,
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
@@ -477,8 +483,8 @@ class ConfigurationRegistry {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: 'object',
-            description: ( localize(1676, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(1677, "This setting does not support per-language configuration.")),
+            description: ( localize(1711, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(1712, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId,
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -554,25 +560,25 @@ const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
 function validateProperty(property, schema) {
     if (!property.trim()) {
-        return localize(1678, "Cannot register an empty property");
+        return localize(1713, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            1679,
+            1714,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
     if (configurationRegistry.getConfigurationProperties()[property] !== undefined) {
         return localize(
-            1680,
+            1715,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            1681,
+            1716,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}.",
             property,
             schema.policy?.name,

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

@@ -37,6 +37,7 @@ export declare class PolicyConfiguration extends Disposable implements IPolicyCo
     private readonly logService;
     private readonly _onDidChangeConfiguration;
     readonly onDidChangeConfiguration: Event<ConfigurationModel>;
+    private readonly configurationRegistry;
     private _configurationModel;
     get configurationModel(): ConfigurationModel;
     constructor(defaultConfiguration: DefaultConfiguration, policyService: IPolicyService, logService: ILogService);

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { coalesce } from '../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { equals } from '../../../base/common/objects.js';
+import { deepClone, equals } from '../../../base/common/objects.js';
 import { isEmptyObject, isString } from '../../../base/common/types.js';
 import { ConfigurationModel } from './configurationModels.js';
 import { Extensions } from './configurationRegistry.js';
@@ -55,7 +55,7 @@ let DefaultConfiguration$1 = class DefaultConfiguration extends Disposable {
                 this._configurationModel.setValue(key, defaultOverrideValue);
             }
             else if (propertySchema) {
-                this._configurationModel.setValue(key, propertySchema.default);
+                this._configurationModel.setValue(key, deepClone(propertySchema.default));
             }
             else {
                 this._configurationModel.removeValue(key);
@@ -80,10 +80,12 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
+        this.configurationRegistry = ( Registry.as(Extensions.Configuration));
     }
     async initialize() {
         this.logService.trace('PolicyConfiguration#initialize');
         this.update(await this.updatePolicyDefinitions(this.defaultConfiguration.configurationModel.keys), false);
+        this.update(await this.updatePolicyDefinitions(( Object.keys(this.configurationRegistry.getExcludedConfigurationProperties()))), false);
         this._register(this.policyService.onDidChange(policyNames => this.onDidChangePolicies(policyNames)));
         this._register(this.defaultConfiguration.onDidChangeConfiguration(async ({ properties }) => this.update(await this.updatePolicyDefinitions(properties), true)));
         return this._configurationModel;
@@ -92,20 +94,26 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
         this.logService.trace('PolicyConfiguration#updatePolicyDefinitions', properties);
         const policyDefinitions = {};
         const keys = [];
-        const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
+        const configurationProperties = this.configurationRegistry.getConfigurationProperties();
+        const excludedConfigurationProperties = this.configurationRegistry.getExcludedConfigurationProperties();
         for (const key of properties) {
-            const config = configurationProperties[key];
+            const config = configurationProperties[key] ?? excludedConfigurationProperties[key];
             if (!config) {
                 keys.push(key);
                 continue;
             }
             if (config.policy) {
-                if (config.type !== 'string' && config.type !== 'number' && config.type !== 'array' && config.type !== 'object') {
+                if (config.type !== 'string' && config.type !== 'number' && config.type !== 'array' && config.type !== 'object' && config.type !== 'boolean') {
                     this.logService.warn(`Policy ${config.policy.name} has unsupported type ${config.type}`);
                     continue;
                 }
+                const { defaultValue, previewFeature } = config.policy;
                 keys.push(key);
-                policyDefinitions[config.policy.name] = { type: config.type === 'number' ? 'number' : 'string' };
+                policyDefinitions[config.policy.name] = {
+                    type: config.type === 'number' ? 'number' : config.type === 'boolean' ? 'boolean' : 'string',
+                    previewFeature,
+                    defaultValue,
+                };
             }
         }
         if (!isEmptyObject(policyDefinitions)) {
@@ -115,17 +123,18 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
     }
     onDidChangePolicies(policyNames) {
         this.logService.trace('PolicyConfiguration#onDidChangePolicies', policyNames);
-        const policyConfigurations = ( Registry.as(Extensions.Configuration)).getPolicyConfigurations();
+        const policyConfigurations = this.configurationRegistry.getPolicyConfigurations();
         const keys = coalesce(( policyNames.map(policyName => policyConfigurations.get(policyName))));
         this.update(keys, true);
     }
     update(keys, trigger) {
         this.logService.trace('PolicyConfiguration#update', keys);
-        const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
+        const configurationProperties = this.configurationRegistry.getConfigurationProperties();
+        const excludedConfigurationProperties = this.configurationRegistry.getExcludedConfigurationProperties();
         const changed = [];
         const wasEmpty = this._configurationModel.isEmpty();
         for (const key of keys) {
-            const proprety = configurationProperties[key];
+            const proprety = configurationProperties[key] ?? excludedConfigurationProperties[key];
             const policyName = proprety?.policy?.name;
             if (policyName) {
                 let policyValue = this.policyService.getPolicyValue(policyName);

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(1682, "A command that returns information about context keys")),
+        description: ( localize(1717, "A command that returns information about context keys")),
         args: []
     }
 });

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

@@ -366,6 +366,7 @@ export declare class RawContextKey<T extends ContextKeyValue> extends ContextKey
     toNegated(): ContextKeyExpression;
     isEqualTo(value: any): ContextKeyExpression;
     notEqualsTo(value: any): ContextKeyExpression;
+    greater(value: any): ContextKeyExpression;
 }
 export type ContextKeyValue = null | undefined | boolean | number | string | Array<null | undefined | boolean | number | string> | Record<string, null | undefined | boolean | number | string>;
 export interface IContext {

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

@@ -47,17 +47,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1683, "Empty context key expression"));
+const errorEmptyString = ( localize(1718, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1684,
+    1719,
     "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(1685, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1686, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1687, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1688, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1689, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1690, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(1720, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(1721, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(1722, "Unexpected token"));
+const hintUnexpectedToken = ( localize(1723, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(1724, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(1725, "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(1691, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(1726, "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(1692, "Unexpected token. Hint: {0}", se.additionalInfo)) :
-                    ( localize(1693, "Unexpected token.")),
+                    ( localize(1727, "Unexpected token. Hint: {0}", se.additionalInfo)) :
+                    ( localize(1728, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length,
             })));
@@ -1504,6 +1504,9 @@ class RawContextKey extends ContextKeyDefinedExpr {
     notEqualsTo(value) {
         return ContextKeyNotEqualsExpr.create(this.key, value);
     }
+    greater(value) {
+        return ContextKeyGreaterExpr.create(this.key, value);
+    }
 }
 function cmp1(key1, key2) {
     if (key1 < key2) {

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

@@ -3,16 +3,16 @@ import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../.
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1694, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1695, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1696, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1697, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1698, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1699, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1700, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1729, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1730, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1731, "Whether the operating system is Windows"))));
+const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1732, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1733, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1734, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1735, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey('isDevelopment', false, true));
-const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1701, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1736, "Quality type of VS Code"))));
 const InputFocusedContextKey = 'inputFocus';
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1702, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1737, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

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

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
         case 1:
-            return localize(1703, "Did you mean {0}?", meant[0]);
+            return localize(1738, "Did you mean {0}?", meant[0]);
         case 2:
-            return localize(1704, "Did you mean {0} or {1}?", meant[0], meant[1]);
+            return localize(1739, "Did you mean {0} or {1}?", meant[0], meant[1]);
         case 3:
-            return localize(1705, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+            return localize(1740, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
         default:
             return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1706, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(1741, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1707,
+    1742,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/\'."
 ));
 class Scanner {

package/vscode/src/vs/platform/contextview/browser/contextMenuHandler.js

@@ -35,6 +35,7 @@ class ContextMenuHandler {
             canRelayout: false,
             anchorAlignment: delegate.anchorAlignment,
             anchorAxisAlignment: delegate.anchorAxisAlignment,
+            layer: delegate.layer,
             render: (container) => {
                 this.lastContainer = container;
                 const className = delegate.getMenuClassName ? delegate.getMenuClassName() : '';