@codingame/monaco-vscode-configuration-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js

@@ -16,7 +16,7 @@ import { NullPolicyConfiguration, PolicyConfiguration } from '@codingame/monaco-
 import { Configuration } from '../common/configurationModels.js';
 import { LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES, APPLICATION_SCOPES, APPLY_ALL_PROFILES_SETTING, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { Extensions, keyFromOverrideIdentifiers, ConfigurationScope, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, applicationMachineSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, isConfigurationDefaultSourceEquals } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, keyFromOverrideIdentifiers, ConfigurationScope, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, applicationMachineSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId, isConfigurationDefaultSourceEquals, getConfigurationExperimentName } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces';
 import { EditableConfigurationTarget, ConfigurationEditing } from '../common/configurationEditing.js';
 import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
@@ -40,6 +40,8 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { runWhenWindowIdle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { fixSettingLinks } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferencesModels';
+import { IExperimentalSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/experimentalSettings.service';
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 function getLocalUserConfigurationScopes(userDataProfile, hasRemote) {
     const isDefaultProfile = userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings;
@@ -1334,7 +1336,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
         } : workspaceSettingsSchema;
         const configDefaultsSchema = {
             type: "object",
-            description: ( localize(21725, "Contribute defaults for configurations")),
+            description: ( localize(24300, "Contribute defaults for configurations")),
             properties: Object.assign(
                 {},
                 this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
@@ -1402,7 +1404,8 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
         extensionService,
         configurationService,
         environmentService,
-        logService
+        logService,
+        experimentalSettingsService
     ) {
         super();
         this.workbenchAssignmentService = workbenchAssignmentService;
@@ -1410,10 +1413,12 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
         this.configurationService = configurationService;
         this.environmentService = environmentService;
         this.logService = logService;
+        this.experimentalSettingsService = experimentalSettingsService;
         this.processedExperimentalSettings = ( new Set());
         this.autoExperimentalSettings = ( new Set());
         this.pendingStartupExperimentalSettings = ( new Set());
         this.registeredExperimentalDefaults = ( new Map());
+        this.assignmentRequests = ( new Map());
         this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         this.throttler = this._register(( new Throttler()));
         this.throttler.queue(() => this.updateDefaults());
@@ -1432,7 +1437,7 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
     async updateDefaults() {
         this.logService.trace("ConfigurationService#updateDefaults: begin");
         try {
-            await this.processExperimentalSettings(( Object.keys(this.configurationRegistry.getConfigurationProperties())), false);
+            await this.processExperimentalSettings([...( Object.keys(this.configurationRegistry.getConfigurationProperties())), ...( Object.keys(this.configurationRegistry.getExcludedConfigurationProperties()))], false);
         } finally {
             await this.extensionService.whenInstalledExtensionsRegistered();
             this.logService.trace("ConfigurationService#updateDefaults: resetting the defaults");
@@ -1442,11 +1447,15 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
     async processExperimentalSettings(properties, autoRefetch) {
         const removedDefaults = [];
         const addedDefaults = [];
+        const assignmentUpdates = [];
         const allProperties = this.configurationRegistry.getConfigurationProperties();
+        const excludedProperties = this.configurationRegistry.getExcludedConfigurationProperties();
         const defaultConfigurationsPreventingExperimentOverrides = this.configurationRegistry.getRegisteredDefaultConfigurations().filter(configuration => configuration.preventExperimentOverride);
         for (const property of properties) {
-            const schema = allProperties[property];
+            const schema = allProperties[property] ?? excludedProperties[property];
             if (!schema?.experiment) {
+                this.assignmentRequests.delete(property);
+                this.experimentalSettingsService.setAssignment(property, false);
                 const registeredDefault = this.registeredExperimentalDefaults.get(property);
                 if (registeredDefault) {
                     this.registeredExperimentalDefaults.delete(property);
@@ -1461,6 +1470,8 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
             if (defaultValueSource && ( defaultConfigurationsPreventingExperimentOverrides.some(
                 configuration => isConfigurationDefaultSourceEquals(configuration.source, defaultValueSource) && configuration.overrides?.[property] !== undefined
             ))) {
+                this.assignmentRequests.delete(property);
+                this.experimentalSettingsService.setAssignment(property, false);
                 const registeredDefault = this.registeredExperimentalDefaults.get(property);
                 if (registeredDefault) {
                     this.registeredExperimentalDefaults.delete(property);
@@ -1470,16 +1481,37 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
                 this.pendingStartupExperimentalSettings.delete(property);
                 continue;
             }
-            if (!autoRefetch && ( this.processedExperimentalSettings.has(property))) {
+            const isAutoExperiment = schema.experiment.mode === "auto";
+            if (( this.processedExperimentalSettings.has(property)) && (!autoRefetch || (!isAutoExperiment && !( this.pendingStartupExperimentalSettings.has(property))))) {
                 continue;
             }
             this.processedExperimentalSettings.add(property);
-            const isAutoExperiment = schema.experiment.mode === "auto";
             if (isAutoExperiment) {
                 this.autoExperimentalSettings.add(property);
             }
+            const request = {};
+            this.assignmentRequests.set(property, request);
             try {
-                const value = await this.workbenchAssignmentService.getTreatment(schema.experiment.name ?? `config.${property}`);
+                const {
+                    value,
+                    hasAssignment
+                } = await this.workbenchAssignmentService.getTreatmentWithAssignment(getConfigurationExperimentName(property, schema.experiment));
+                assignmentUpdates.push(hasAssignment.then(assigned => {
+                    if (!this._store.isDisposed && this.assignmentRequests.get(property) === request && (allProperties[property] ?? excludedProperties[property])?.experiment === schema.experiment) {
+                        this.experimentalSettingsService.setAssignment(property, assigned);
+                    }
+                }, error => {
+                    if (!isCancellationError(error)) {
+                        this.logService.error(
+                            "ConfigurationService#processExperimentalSettings: assignment",
+                            property,
+                            error
+                        );
+                    }
+                }));
+                if (this._store.isDisposed || this.assignmentRequests.get(property) !== request || (allProperties[property] ?? excludedProperties[property]) !== schema) {
+                    continue;
+                }
                 if (!isAutoExperiment) {
                     if (isUndefined(value)) {
                         this.pendingStartupExperimentalSettings.add(property);
@@ -1507,7 +1539,15 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
                     this.registeredExperimentalDefaults.delete(property);
                     removedDefaults.push(registeredDefault);
                 }
-            } catch (error) {}
+            } catch (error) {
+                if (isCancellationError(error)) {
+                    if (!isAutoExperiment && !this._store.isDisposed && this.assignmentRequests.get(property) === request) {
+                        this.pendingStartupExperimentalSettings.add(property);
+                    }
+                } else {
+                    this.logService.error("ConfigurationService#processExperimentalSettings", property, error);
+                }
+            }
         }
         if (removedDefaults.length || addedDefaults.length) {
             this.configurationRegistry.deltaConfiguration({
@@ -1515,6 +1555,7 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
                 addedDefaults: addedDefaults.length ? addedDefaults : undefined
             });
         }
+        await Promise.all(assignmentUpdates);
     }
     shouldOverride(value, schema) {
         if (isUndefined(value)) {
@@ -1526,7 +1567,7 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
         return !equals(value, schema.default);
     }
 };
-ConfigurationDefaultOverridesContribution = ( __decorate([( __param(0, IWorkbenchAssignmentService)), ( __param(1, IExtensionService)), ( __param(2, IConfigurationService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, ILogService))], ConfigurationDefaultOverridesContribution));
+ConfigurationDefaultOverridesContribution = ( __decorate([( __param(0, IWorkbenchAssignmentService)), ( __param(1, IExtensionService)), ( __param(2, IConfigurationService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, ILogService)), ( __param(5, IExperimentalSettingsService))], ConfigurationDefaultOverridesContribution));
 const workbenchContributionsRegistry = ( Registry.as(Extensions$2.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(
@@ -1540,7 +1581,7 @@ configurationRegistry.registerConfiguration({
     properties: {
         [APPLY_ALL_PROFILES_SETTING]: {
             "type": "array",
-            description: ( localize(21726, "Configure settings to be applied for all profiles.")),
+            description: ( localize(24301, "Configure settings to be applied for all profiles.")),
             "default": [],
             "scope": ConfigurationScope.APPLICATION,
             additionalProperties: true,

package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js

@@ -163,7 +163,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                 );
             }
             throw ( new ConfigurationEditingError(( localize(
-                21727,
+                24302,
                 "Error while writing to {0}. {1}",
                 this.stringifyTarget(operation.target),
                 error.message
@@ -244,7 +244,7 @@ let ConfigurationEditing = class ConfigurationEditing {
         }
     }
     onInvalidConfigurationError(error, operation) {
-        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(21728, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(21729, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(21730, "Open MCP Configuration")) : null;
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(24303, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(24304, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(24305, "Open MCP Configuration")) : null;
         if (openStandAloneConfigurationActionLabel) {
             this.notificationService.prompt(Severity.Error, error.message, [{
                 label: openStandAloneConfigurationActionLabel,
@@ -252,16 +252,16 @@ let ConfigurationEditing = class ConfigurationEditing {
             }]);
         } else {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                label: ( localize(21731, "Open Settings")),
+                label: ( localize(24306, "Open Settings")),
                 run: () => this.openSettings(operation)
             }]);
         }
     }
     onConfigurationFileDirtyError(error, operation, scopes) {
-        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(21728, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(21729, "Open Launch Configuration")) : null;
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(24303, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(24304, "Open Launch Configuration")) : null;
         if (openStandAloneConfigurationActionLabel) {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                label: ( localize(21732, "Save and Retry")),
+                label: ( localize(24307, "Save and Retry")),
                 run: () => {
                     const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
                     this.writeConfiguration(operation.target, {
@@ -278,7 +278,7 @@ let ConfigurationEditing = class ConfigurationEditing {
             }]);
         } else {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                label: ( localize(21732, "Save and Retry")),
+                label: ( localize(24307, "Save and Retry")),
                 run: () => this.writeConfiguration(operation.target, {
                     key: operation.key,
                     value: operation.value
@@ -287,7 +287,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                     scopes
                 })
             }, {
-                label: ( localize(21731, "Open Settings")),
+                label: ( localize(24306, "Open Settings")),
                 run: () => this.openSettings(operation)
             }]);
         }
@@ -335,61 +335,61 @@ let ConfigurationEditing = class ConfigurationEditing {
         switch (error) {
         case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION:
             return localize(
-                21733,
+                24308,
                 "Unable to write {0} because it is configured in system policy.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY:
             return localize(
-                21734,
+                24309,
                 "Unable to write to {0} because {1} is not a registered configuration.",
                 this.stringifyTarget(target),
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION:
             return localize(
-                21735,
+                24310,
                 "Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE:
             return localize(
-                21736,
+                24311,
                 "Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION:
             return localize(
-                21737,
+                24312,
                 "Unable to write to Folder Settings because {0} does not support the folder resource scope.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET:
             return localize(
-                21738,
+                24313,
                 "Unable to write to User Settings because {0} does not support for global scope.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET:
             return localize(
-                21739,
+                24314,
                 "Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET:
             return localize(
-                21740,
+                24315,
                 "Unable to write to Folder Settings because no resource is provided."
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION:
             return localize(
-                21741,
+                24316,
                 "Unable to write to Language Settings because {0} is not a resource language setting.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED:
             return localize(
-                21742,
+                24317,
                 "Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
                 this.stringifyTarget(target)
             );
@@ -397,36 +397,36 @@ let ConfigurationEditing = class ConfigurationEditing {
             {
                 if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                     return localize(
-                        21743,
+                        24318,
                         "Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
                     );
                 }
                 if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
                     return localize(
-                        21744,
+                        24319,
                         "Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
                     );
                 }
                 if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
                     return localize(
-                        21745,
+                        24320,
                         "Unable to write into the MCP configuration file. Please open it to correct errors/warnings in it and try again."
                     );
                 }
                 switch (target) {
                 case EditableConfigurationTarget.USER_LOCAL:
                     return localize(
-                        21746,
+                        24321,
                         "Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
                     );
                 case EditableConfigurationTarget.USER_REMOTE:
                     return localize(
-                        21747,
+                        24322,
                         "Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
                     );
                 case EditableConfigurationTarget.WORKSPACE:
                     return localize(
-                        21748,
+                        24323,
                         "Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
                     );
                 case EditableConfigurationTarget.WORKSPACE_FOLDER:
@@ -439,7 +439,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                             }
                         }
                         return localize(
-                            21749,
+                            24324,
                             "Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
                             workspaceFolderName
                         );
@@ -452,36 +452,36 @@ let ConfigurationEditing = class ConfigurationEditing {
             {
                 if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                     return localize(
-                        21750,
+                        24325,
                         "Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
                     );
                 }
                 if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
                     return localize(
-                        21751,
+                        24326,
                         "Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
                     );
                 }
                 if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
                     return localize(
-                        21752,
+                        24327,
                         "Unable to write into MCP configuration file because the file has unsaved changes. Please save it first and then try again."
                     );
                 }
                 switch (target) {
                 case EditableConfigurationTarget.USER_LOCAL:
                     return localize(
-                        21753,
+                        24328,
                         "Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
                     );
                 case EditableConfigurationTarget.USER_REMOTE:
                     return localize(
-                        21754,
+                        24329,
                         "Unable to write into remote user settings because the file has unsaved changes. Please save the remote user settings file first and then try again."
                     );
                 case EditableConfigurationTarget.WORKSPACE:
                     return localize(
-                        21755,
+                        24330,
                         "Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
                     );
                 case EditableConfigurationTarget.WORKSPACE_FOLDER:
@@ -494,7 +494,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                             }
                         }
                         return localize(
-                            21756,
+                            24331,
                             "Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
                             workspaceFolderName
                         );
@@ -506,47 +506,47 @@ let ConfigurationEditing = class ConfigurationEditing {
         case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE:
             if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                 return localize(
-                    21757,
+                    24332,
                     "Unable to write into tasks configuration file because the content of the file is newer."
                 );
             }
             if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
                 return localize(
-                    21758,
+                    24333,
                     "Unable to write into launch configuration file because the content of the file is newer."
                 );
             }
             if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
                 return localize(
-                    21759,
+                    24334,
                     "Unable to write into MCP configuration file because the content of the file is newer."
                 );
             }
             switch (target) {
             case EditableConfigurationTarget.USER_LOCAL:
                 return localize(
-                    21760,
+                    24335,
                     "Unable to write into user settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.USER_REMOTE:
                 return localize(
-                    21761,
+                    24336,
                     "Unable to write into remote user settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.WORKSPACE:
                 return localize(
-                    21762,
+                    24337,
                     "Unable to write into workspace settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.WORKSPACE_FOLDER:
                 return localize(
-                    21763,
+                    24338,
                     "Unable to write into folder settings because the content of the file is newer."
                 );
             }
         case ConfigurationEditingErrorCode.ERROR_INTERNAL:
             return localize(
-                21764,
+                24339,
                 "Unable to write to {0} because of an internal error.",
                 this.stringifyTarget(target)
             );
@@ -555,13 +555,13 @@ let ConfigurationEditing = class ConfigurationEditing {
     stringifyTarget(target) {
         switch (target) {
         case EditableConfigurationTarget.USER_LOCAL:
-            return localize(21765, "User Settings");
+            return localize(24340, "User Settings");
         case EditableConfigurationTarget.USER_REMOTE:
-            return localize(21766, "Remote User Settings");
+            return localize(24341, "Remote User Settings");
         case EditableConfigurationTarget.WORKSPACE:
-            return localize(21767, "Workspace Settings");
+            return localize(24342, "Workspace Settings");
         case EditableConfigurationTarget.WORKSPACE_FOLDER:
-            return localize(21768, "Folder Settings");
+            return localize(24343, "Folder Settings");
         default:
             return "";
         }

package/vscode/src/vs/workbench/services/configuration/common/experimentalSettings.d.ts

@@ -0,0 +1,12 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IExperimentalSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/experimentalSettings.service";
+export declare class ExperimentalSettingsService extends Disposable implements IExperimentalSettingsService {
+    readonly _serviceBrand: undefined;
+    private readonly assignments;
+    private pendingChanges;
+    private readonly _onDidChangeAssignments;
+    readonly onDidChangeAssignments: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ReadonlySet<string>>;
+    private readonly changeScheduler;
+    hasAssignment(setting: string): boolean;
+    setAssignment(setting: string, assigned: boolean): void;
+}

package/vscode/src/vs/workbench/services/configuration/common/experimentalSettings.js

@@ -0,0 +1,40 @@
+
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+class ExperimentalSettingsService extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.assignments = ( new Set());
+        this.pendingChanges = ( new Set());
+        this._onDidChangeAssignments = this._register(( new Emitter()));
+        this.onDidChangeAssignments = this._onDidChangeAssignments.event;
+        this.changeScheduler = this._register(( new RunOnceScheduler(() => {
+            const changes = this.pendingChanges;
+            this.pendingChanges = ( new Set());
+            this._onDidChangeAssignments.fire(changes);
+        }, 0)));
+    }
+    hasAssignment(setting) {
+        return ( this.assignments.has(setting));
+    }
+    setAssignment(setting, assigned) {
+        if (( this.assignments.has(setting)) === assigned) {
+            return;
+        }
+        if (assigned) {
+            this.assignments.add(setting);
+        } else {
+            this.assignments.delete(setting);
+        }
+        this.pendingChanges.add(setting);
+        if (!this.changeScheduler.isScheduled()) {
+            this.changeScheduler.schedule();
+        }
+    }
+}
+
+export { ExperimentalSettingsService };

package/vscode/src/vs/workbench/services/configuration/common/managedSettingsPresentation.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ManagedSettingsPresentationValue } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry";
+import { IManagedSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings.service";
+import { IManagedSettingsPresentationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/managedSettingsPresentation.service";
+export declare class ManagedSettingsPresentationService extends Disposable implements IManagedSettingsPresentationService {
+    private readonly managedSettingsService;
+    readonly _serviceBrand: undefined;
+    private readonly registry;
+    private values;
+    private readonly _onDidChange;
+    readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ReadonlySet<string>>;
+    constructor(managedSettingsService: IManagedSettingsService);
+    getValue(setting: string, localValue?: unknown): ManagedSettingsPresentationValue | undefined;
+    private update;
+}

package/vscode/src/vs/workbench/services/configuration/common/managedSettingsPresentation.js

@@ -0,0 +1,55 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IManagedSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings.service';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+let ManagedSettingsPresentationService = class ManagedSettingsPresentationService extends Disposable {
+    constructor(managedSettingsService) {
+        super();
+        this.managedSettingsService = managedSettingsService;
+        this.registry = ( Registry.as(Extensions.Configuration));
+        this.values = ( new Map());
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this.update();
+        this._register(managedSettingsService.onDidChangeManagedSettings(() => this.update()));
+        this._register(this.registry.onDidUpdateConfiguration(() => this.update()));
+    }
+    getValue(setting, localValue) {
+        return this.registry.getConfigurationProperties()[setting]?.managedSettingsPresentation?.(key => this.managedSettingsService.getManagedSettingValue(key), localValue);
+    }
+    update() {
+        const values = ( new Map());
+        const changed = ( new Set());
+        for (const [key, property] of Object.entries(this.registry.getConfigurationProperties())) {
+            if (!property.managedSettingsPresentation) {
+                continue;
+            }
+            const value = this.getValue(key);
+            if (value !== undefined) {
+                values.set(key, value);
+            }
+            if (!equals(value, this.values.get(key))) {
+                changed.add(key);
+            }
+        }
+        for (const key of ( this.values.keys())) {
+            if (!( values.has(key))) {
+                changed.add(key);
+            }
+        }
+        this.values = values;
+        if (changed.size) {
+            this._onDidChange.fire(changed);
+        }
+    }
+};
+ManagedSettingsPresentationService = ( __decorate([( __param(0, IManagedSettingsService))], ManagedSettingsPresentationService));
+
+export { ManagedSettingsPresentationService };

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.d.ts

@@ -10,7 +10,7 @@ import { IWorkspaceFolderData } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
+import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService";
 import { AbstractVariableResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/variableResolver";
 export declare abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
     private readonly configurationService;