@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -431,12 +431,17 @@ class ConfigurationModelParser {
                 hasExcludedProperties = hasExcludedProperties || result.hasExcludedProperties;
                 restricted.push(...result.restricted);
             } else {
-                const propertySchema = configurationProperties[key];
-                if (propertySchema?.restricted) {
-                    restricted.push(key);
-                }
-                if (this.shouldInclude(key, propertySchema, excludedConfigurationProperties, options)) {
-                    raw[key] = properties[key];
+                const result = this.filterProperty(
+                    key,
+                    properties[key],
+                    configurationProperties,
+                    excludedConfigurationProperties,
+                    options
+                );
+                restricted.push(...result.restricted);
+                hasExcludedProperties = hasExcludedProperties || result.hasExcludedProperties;
+                if (result.included) {
+                    raw[key] = result.value;
                 } else {
                     hasExcludedProperties = true;
                 }
@@ -448,6 +453,85 @@ class ConfigurationModelParser {
             hasExcludedProperties
         };
     }
+    filterProperty(
+        path,
+        value,
+        configurationProperties,
+        excludedConfigurationProperties,
+        options
+    ) {
+        const propertySchema = configurationProperties[path];
+        if (propertySchema) {
+            return {
+                included: this.shouldInclude(path, propertySchema, excludedConfigurationProperties, options),
+                value,
+                restricted: propertySchema.restricted ? [path] : [],
+                hasExcludedProperties: false
+            };
+        }
+        if (!isObject(value) || Array.isArray(value)) {
+            return {
+                included: this.shouldInclude(path, propertySchema, excludedConfigurationProperties, options),
+                value,
+                restricted: [],
+                hasExcludedProperties: false
+            };
+        }
+        if (excludedConfigurationProperties[path]) {
+            return {
+                included: this.shouldInclude(path, propertySchema, excludedConfigurationProperties, options),
+                value,
+                restricted: [],
+                hasExcludedProperties: false
+            };
+        }
+        if (options.exclude?.includes(path)) {
+            return {
+                included: false,
+                value,
+                restricted: [],
+                hasExcludedProperties: false
+            };
+        }
+        const keys = ( Object.keys(value));
+        if (keys.length === 0) {
+            return {
+                included: this.shouldInclude(path, propertySchema, excludedConfigurationProperties, options),
+                value,
+                restricted: [],
+                hasExcludedProperties: false
+            };
+        }
+        const nested = {};
+        const restricted = [];
+        let included = false;
+        let hasExcludedProperties = false;
+        for (const key of keys) {
+            const result = this.filterProperty(
+                `${path}.${key}`,
+                value[key],
+                configurationProperties,
+                excludedConfigurationProperties,
+                options
+            );
+            if (result.restricted.length) {
+                restricted.push(...result.restricted);
+            }
+            hasExcludedProperties = hasExcludedProperties || result.hasExcludedProperties;
+            if (result.included) {
+                nested[key] = result.value;
+                included = true;
+            } else {
+                hasExcludedProperties = true;
+            }
+        }
+        return {
+            included,
+            value: nested,
+            restricted,
+            hasExcludedProperties
+        };
+    }
     shouldInclude(key, propertySchema, excludedConfigurationProperties, options) {
         if (options.exclude?.includes(key)) {
             return false;

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

@@ -15,6 +15,43 @@ export interface IConfigurationDelta {
     addedDefaults?: IConfigurationDefaults[];
     addedConfigurations?: IConfigurationNode[];
 }
+/**
+ * Declares that a setting's value should be mirrored into the agent host's root
+ * configuration, removing the need to hand-write a forwarder per setting.
+ *
+ * Only the setting's *globally-scoped* value is mirrored — the resolution order
+ * is policy, then user, then application, then default. Workspace and folder
+ * values are deliberately ignored: the agent host root config is shared by every
+ * window connected to a host, so a workspace-specific value would leak across
+ * unrelated windows on a last-writer-wins basis.
+ *
+ * A setting that genuinely needs per-workspace behavior should not use this;
+ * push it through session config instead, where the session → parent → host
+ * chain resolves precedence correctly.
+ */
+export interface IAgentHostConfigurationSync {
+    /** The agent host root configuration key to write the value to. */
+    readonly key: string;
+    /**
+     * Maps the globally-scoped setting value to the value written to {@link key}.
+     * Defaults to the identity, which is what most settings want: the resolver
+     * already skips layers whose value does not conform to the declared `type`
+     * and falls back to the registered default, so a transform is only needed to
+     * change the *shape* of the value (for example mapping an enum to a
+     * different representation the agent host expects).
+     */
+    readonly transform?: (value: unknown) => unknown;
+    /** Which Agent Host targets receive this setting. Defaults to {@link AgentHostConfigurationSyncScope.All}. */
+    readonly scope?: AgentHostConfigurationSyncScope;
+}
+export declare enum AgentHostConfigurationSyncScope {
+    /** Mirror to every Agent Host connection. */
+    All = "all",
+    /** Mirror only to the local utility-process Agent Host. */
+    Local = "local",
+    /** Mirror to the ambient Agent Host, whether local or colocated with a remote extension host. */
+    Ambient = "ambient"
+}
 export interface IConfigurationRegistry {
     /**
      * Register a configuration to the registry.
@@ -92,6 +129,13 @@ export interface IConfigurationRegistry {
      * Returns the referencing setting keys per policy name.
      */
     getPolicyReferenceConfigurations(): Map<PolicyName, Set<string>>;
+    /**
+     * Returns the {@link IAgentHostConfigurationSync} descriptor per setting key
+     * for every setting that declares one. Includes settings hidden from the
+     * Settings UI via `included: false`, which are absent from
+     * {@link getConfigurationProperties}.
+     */
+    getAgentHostSyncConfigurations(): Map<string, IAgentHostConfigurationSync>;
     /**
      * Returns all excluded configurations settings of all configuration nodes contributed to this registry.
      */
@@ -189,6 +233,12 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
      * The type must match the owning setting (enforced when exporting the policy catalog).
      */
     policyReference?: IPolicyReference;
+    /**
+     * When specified, this setting's globally-scoped value is mirrored into the
+     * agent host's root configuration automatically, without any per-setting
+     * plumbing. See {@link IAgentHostConfigurationSync}.
+     */
+    agentHost?: IAgentHostConfigurationSync;
     /**
      * When specified, this setting's default value can always be overwritten by
      * an experiment.

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

@@ -17,6 +17,12 @@ var EditPresentationTypes;
 const Extensions = {
     Configuration: "base.contributions.configuration"
 };
+var AgentHostConfigurationSyncScope;
+(function(AgentHostConfigurationSyncScope) {
+    AgentHostConfigurationSyncScope["All"] = "all";
+    AgentHostConfigurationSyncScope["Local"] = "local";
+    AgentHostConfigurationSyncScope["Ambient"] = "ambient";
+})(AgentHostConfigurationSyncScope || (AgentHostConfigurationSyncScope = {}));
 var ConfigurationScope;
 (function(ConfigurationScope) {
     ConfigurationScope[ConfigurationScope["APPLICATION"] = 1] = "APPLICATION";
@@ -74,6 +80,7 @@ class ConfigurationRegistry extends Disposable {
     constructor() {
         super();
         this.registeredConfigurationDefaults = [];
+        this.excludedAgentHostSyncKeys = ( new Map());
         this.overrideIdentifiers = ( new Set());
         this._onDidSchemaChange = this._register(( new Emitter()));
         this.onDidSchemaChange = this._onDidSchemaChange.event;
@@ -82,7 +89,7 @@ class ConfigurationRegistry extends Disposable {
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: "defaultOverrides",
-            title: ( localize(1947, "Default Language Configuration Overrides")),
+            title: ( localize(2117, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -96,6 +103,7 @@ class ConfigurationRegistry extends Disposable {
         this.configurationProperties = {};
         this.policyConfigurations = ( new Map());
         this.policyReferenceConfigurations = ( new Map());
+        this.agentHostSyncConfigurations = ( new Map());
         this.excludedConfigurationProperties = {};
         contributionRegistry.registerSchema(resourceLanguageSettingsSchemaId, this.resourceLanguageSettingsSchema);
         this.registerOverridePropertyPatternKey();
@@ -284,7 +292,7 @@ class ConfigurationRegistry extends Disposable {
             type: "object",
             default: newDefaultOverride.value,
             description: ( localize(
-                1948,
+                2118,
                 "Configure settings to be overridden for {0}.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -414,6 +422,14 @@ class ConfigurationRegistry extends Disposable {
     }
     doDeregisterConfigurations(configurations, bucket) {
         const deregisterConfiguration = configuration => {
+            const excludedSyncKeys = this.excludedAgentHostSyncKeys.get(configuration);
+            if (excludedSyncKeys) {
+                for (const key of excludedSyncKeys) {
+                    bucket.add(key);
+                    this.agentHostSyncConfigurations.delete(key);
+                }
+                this.excludedAgentHostSyncKeys.delete(configuration);
+            }
             if (configuration.properties) {
                 for (const key in configuration.properties) {
                     bucket.add(key);
@@ -421,6 +437,7 @@ class ConfigurationRegistry extends Disposable {
                     if (property?.policy?.name) {
                         this.policyConfigurations.delete(property.policy.name);
                     }
+                    this.agentHostSyncConfigurations.delete(key);
                     if (property?.policyReference?.name) {
                         const refs = this.policyReferenceConfigurations.get(property.policyReference.name);
                         if (refs) {
@@ -492,6 +509,10 @@ class ConfigurationRegistry extends Disposable {
                 const excluded = properties[key].hasOwnProperty("included") && !properties[key].included;
                 const policyName = properties[key].policy?.name;
                 const policyReferenceName = properties[key].policyReference?.name;
+                const agentHostSync = properties[key].agentHost;
+                if (agentHostSync) {
+                    this.agentHostSyncConfigurations.set(key, agentHostSync);
+                }
                 if (excluded) {
                     this.excludedConfigurationProperties[key] = properties[key];
                     if (policyName) {
@@ -502,6 +523,15 @@ class ConfigurationRegistry extends Disposable {
                         this.addPolicyReferenceConfiguration(policyReferenceName, key);
                         bucket.add(key);
                     }
+                    if (agentHostSync) {
+                        bucket.add(key);
+                        let excludedSyncKeys = this.excludedAgentHostSyncKeys.get(configuration);
+                        if (!excludedSyncKeys) {
+                            excludedSyncKeys = ( new Set());
+                            this.excludedAgentHostSyncKeys.set(configuration, excludedSyncKeys);
+                        }
+                        excludedSyncKeys.add(key);
+                    }
                     delete properties[key];
                 } else {
                     bucket.add(key);
@@ -545,6 +575,9 @@ class ConfigurationRegistry extends Disposable {
     getPolicyReferenceConfigurations() {
         return this.policyReferenceConfigurations;
     }
+    getAgentHostSyncConfigurations() {
+        return this.agentHostSyncConfigurations;
+    }
     getExcludedConfigurationProperties() {
         return this.excludedConfigurationProperties;
     }
@@ -630,8 +663,8 @@ class ConfigurationRegistry extends Disposable {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: "object",
-                description: ( localize(1949, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(1950, "This setting does not support per-language configuration.")),
+                description: ( localize(2119, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(2120, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
@@ -647,8 +680,8 @@ class ConfigurationRegistry extends Disposable {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: "object",
-            description: ( localize(1949, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(1950, "This setting does not support per-language configuration.")),
+            description: ( localize(2119, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(2120, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -723,38 +756,51 @@ const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
 function validateProperty(property, schema, extensionId) {
     if (!property.trim()) {
-        return localize(1951, "Cannot register an empty property");
+        return localize(2121, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            1952,
+            2122,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
     if (configurationRegistry.getConfigurationProperties()[property] !== undefined && (!extensionId || !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extensionId.toLowerCase())))) {
         return localize(
-            1953,
+            2123,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy && schema.policyReference) {
         return localize(
-            1954,
+            2124,
             "Cannot register '{0}'. A setting must not declare both 'policy' and 'policyReference'.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            1955,
+            2125,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}. To attach another setting to the same policy, use 'policyReference'.",
             property,
             schema.policy?.name,
             configurationRegistry.getPolicyConfigurations().get(schema.policy?.name)
         );
     }
+    if (schema.agentHost) {
+        for (const [owner, sync] of configurationRegistry.getAgentHostSyncConfigurations()) {
+            if (sync.key === schema.agentHost.key && owner !== property) {
+                return localize(
+                    2126,
+                    "Cannot register '{0}'. The agent host configuration key '{1}' is already mirrored from '{2}'.",
+                    property,
+                    schema.agentHost.key,
+                    owner
+                );
+            }
+        }
+    }
     return null;
 }
 function getScopes() {
@@ -803,4 +849,4 @@ const EXTENSION_UNIFICATION_EXTENSION_IDS = ( new Set(product.defaultChatAgent ?
     product.defaultChatAgent.chatExtensionId
 ].map(id => id.toLowerCase())) : []));
 
-export { ConfigurationScope, EXTENSION_UNIFICATION_EXTENSION_IDS, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationMachineSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, isConfigurationDefaultSourceEquals, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };
+export { AgentHostConfigurationSyncScope, ConfigurationScope, EXTENSION_UNIFICATION_EXTENSION_IDS, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationMachineSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, isConfigurationDefaultSourceEquals, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };

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

@@ -99,10 +99,9 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
     async initialize() {
         this.logService.trace("PolicyConfiguration#initialize");
         this.update(
-            await this.updatePolicyDefinitions(this.defaultConfiguration.configurationModel.keys),
+            await this.updatePolicyDefinitions([...this.defaultConfiguration.configurationModel.keys, ...( Object.keys(this.configurationRegistry.getExcludedConfigurationProperties()))]),
             false
         );
-        this.update(await this.updatePolicyDefinitions(( Object.keys(this.configurationRegistry.getExcludedConfigurationProperties()))), false);
         this._register(
             this.policyService.onDidChange(policyNames => this.onDidChangePolicies(policyNames))
         );

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

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

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

@@ -1,6 +1,6 @@
 
 import { CharCode } from '../../../base/common/charCode.js';
-import { isMacintosh, isLinux, isWindows, isWeb, isEdge, isFirefox, isChrome, isSafari } from '../../../base/common/platform.js';
+import { isMacintosh, isLinux, isWindows, isChromeOS, isWeb, isEdge, isFirefox, isChrome, isSafari } from '../../../base/common/platform.js';
 import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
 import { Scanner, TokenType } from './scanner.js';
 import { localize } from '../../../nls.js';
@@ -12,6 +12,7 @@ CONSTANT_VALUES.set("true", true);
 CONSTANT_VALUES.set("isMac", isMacintosh);
 CONSTANT_VALUES.set("isLinux", isLinux);
 CONSTANT_VALUES.set("isWindows", isWindows);
+CONSTANT_VALUES.set("isChromeOS", isChromeOS);
 CONSTANT_VALUES.set("isWeb", isWeb);
 CONSTANT_VALUES.set("isMacNative", isMacintosh && !isWeb);
 CONSTANT_VALUES.set("isEdge", isEdge);
@@ -47,17 +48,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1957, "Empty context key expression"));
+const errorEmptyString = ( localize(2128, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1958,
+    2129,
     "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(1959, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1960, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1961, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1962, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1963, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1964, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(2130, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(2131, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(2132, "Unexpected token"));
+const hintUnexpectedToken = ( localize(2133, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(2134, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(2135, "Did you forget to put a context key?"));
 class Parser {
     static {
         this._parseError = ( new Error());
@@ -391,7 +392,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(1965, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(2136, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({
@@ -479,7 +480,7 @@ function validateWhenClauses(whenClauses) {
         parser.parse(whenClause);
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map(se => ({
-                errorMessage: se.additionalInfo ? ( localize(1966, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(1967, "Unexpected token.")),
+                errorMessage: se.additionalInfo ? ( localize(2137, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(2138, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length
             })));

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

@@ -2,6 +2,7 @@ import { RawContextKey } from "./contextkey.js";
 export declare const IsMacContext: RawContextKey<boolean>;
 export declare const IsLinuxContext: RawContextKey<boolean>;
 export declare const IsWindowsContext: RawContextKey<boolean>;
+export declare const IsChromeOSContext: RawContextKey<boolean>;
 export declare const IsWebContext: RawContextKey<boolean>;
 export declare const IsMacNativeContext: RawContextKey<boolean>;
 export declare const IsIOSContext: RawContextKey<boolean>;

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

@@ -1,18 +1,19 @@
 
-import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../../base/common/platform.js';
+import { isMacintosh, isLinux, isWindows, isChromeOS, isWeb, isIOS, isMobile } from '../../../base/common/platform.js';
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(1968, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(1969, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(1970, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(1971, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(1972, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(1973, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(1974, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(2139, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(2140, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(2141, "Whether the operating system is Windows"))));
+const IsChromeOSContext = ( new RawContextKey("isChromeOS", isChromeOS, ( localize(2142, "Whether the operating system is ChromeOS"))));
+const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(2143, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(2144, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(2145, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(2146, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey("isDevelopment", false, true));
-const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(1975, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(2147, "Quality type of VS Code"))));
 const InputFocusedContextKey = "inputFocus";
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1976, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(2148, "Whether keyboard focus is inside an input box"))));
 
-export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };
+export { InputFocusedContext, InputFocusedContextKey, IsChromeOSContext, 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(1977, "Did you mean {0}?", meant[0]);
+        return localize(2149, "Did you mean {0}?", meant[0]);
     case 2:
-        return localize(1978, "Did you mean {0} or {1}?", meant[0], meant[1]);
+        return localize(2150, "Did you mean {0} or {1}?", meant[0], meant[1]);
     case 3:
-        return localize(1979, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+        return localize(2151, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
     default:
         return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1980, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(2152, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1981,
+    2153,
     "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

@@ -42,6 +42,7 @@ class ContextMenuHandler {
             canRelayout: false,
             anchorAlignment: delegate.anchorAlignment,
             anchorAxisAlignment: delegate.anchorAxisAlignment,
+            closeAnimation: delegate.closeAnimation,
             layer: delegate.layer,
             render: container => {
                 this.lastContainer = container;
@@ -118,7 +119,7 @@ class ContextMenuHandler {
                 }
                 this.lastContainer = null;
             }
-        }, shadowRootElement, !!shadowRootElement);
+        }, shadowRootElement, !!shadowRootElement, delegate.useWindowContainerForShadowRoot);
     }
     onActionRun(e, logTelemetry) {
         if (logTelemetry) {

package/vscode/src/vs/platform/contextview/browser/contextView.d.ts

@@ -1,6 +1,6 @@
 import { IContextMenuDelegate } from "../../../base/browser/contextmenu.js";
 import { StandardMouseEvent } from "../../../base/browser/mouseEvent.js";
-import { AnchorAlignment, AnchorAxisAlignment, IAnchor } from "../../../base/browser/ui/contextview/contextview.js";
+import { AnchorAlignment, AnchorAxisAlignment, IAnchor, IContextViewCloseAnimation } from "../../../base/browser/ui/contextview/contextview.js";
 import { IAction } from "../../../base/common/actions.js";
 import { AnchorPosition } from "../../../base/common/layout.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
@@ -18,7 +18,9 @@ export interface IContextViewDelegate {
     render(container: HTMLElement): IDisposable;
     onDOMEvent?(e: any, activeElement: HTMLElement): void;
     onHide?(data?: any): void;
+    closeAnimation?: IContextViewCloseAnimation;
     focus?(): void;
+    layout?(): void;
     anchorAlignment?: AnchorAlignment;
     anchorAxisAlignment?: AnchorAxisAlignment;
     anchorPosition?: AnchorPosition;

package/vscode/src/vs/platform/contextview/browser/contextView.service.d.ts

@@ -6,7 +6,7 @@ import { IContextViewDelegate, IOpenContextView, type IContextMenuMenuDelegate }
 export declare const IContextViewService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IContextViewService>;
 export interface IContextViewService extends IContextViewProvider {
     readonly _serviceBrand: undefined;
-    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean): IOpenContextView;
+    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean, useWindowContainerForShadowRoot?: boolean): IOpenContextView;
     hideContextView(data?: any): void;
     getContextViewElement(): HTMLElement;
     layout(): void;

package/vscode/src/vs/platform/contextview/browser/contextViewService.d.ts

@@ -8,7 +8,7 @@ export declare class ContextViewHandler extends Disposable implements IContextVi
     private openContextView;
     protected readonly contextView: ContextView;
     constructor(layoutService: ILayoutService);
-    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean): IOpenContextView;
+    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean, useWindowContainerForShadowRoot?: boolean): IOpenContextView;
     layout(): void;
     hideContextView(data?: unknown): void;
 }

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

@@ -13,7 +13,7 @@ let ContextViewHandler = class ContextViewHandler extends Disposable {
         this.layout();
         this._register(layoutService.onDidLayoutContainer(() => this.layout()));
     }
-    showContextView(delegate, container, shadowRoot) {
+    showContextView(delegate, container, shadowRoot, useWindowContainerForShadowRoot) {
         let domPosition;
         if (container) {
             if (container === this.layoutService.getContainer(getWindow(container))) {
@@ -26,7 +26,8 @@ let ContextViewHandler = class ContextViewHandler extends Disposable {
         } else {
             domPosition = ContextViewDOMPosition.ABSOLUTE;
         }
-        this.contextView.setContainer(container ?? this.layoutService.activeContainer, domPosition);
+        const contextViewContainer = useWindowContainerForShadowRoot && container ? this.layoutService.getContainer(getWindow(container)) : container ?? this.layoutService.activeContainer;
+        this.contextView.setContainer(contextViewContainer, domPosition);
         this.contextView.show(delegate);
         const openContextView = {
             close: () => {

package/vscode/src/vs/platform/dataChannel/browser/forwardingTelemetryService.d.ts

@@ -20,7 +20,7 @@ export declare class InterceptingTelemetryService implements ITelemetryService {
     publicLogError(errorEventName: string, data?: ITelemetryData): void;
     publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
     setExperimentProperty(name: string, value: string): void;
-    setCommonProperty(name: string, value: string | boolean): void;
+    setCommonProperty(name: string, value: string | boolean | undefined): void;
 }
 export interface IEditTelemetryData {
     eventName: string;