@codingame/monaco-vscode-configuration-service-override 26.2.1 → 27.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "26.2.1",
+  "version": "27.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - configuration service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.1",
-    "@codingame/monaco-vscode-files-service-override": "26.2.1"
+    "@codingame/monaco-vscode-api": "27.0.0",
+    "@codingame/monaco-vscode-files-service-override": "27.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js

@@ -27,28 +27,28 @@ const configurationEntrySchema = {
     properties: {
         title: {
             description: ( localize(
-                2629,
+                2669,
                 "A title for the current category of settings. This label will be rendered in the Settings editor as a subheading. If the title is the same as the extension display name, then the category will be grouped under the main extension heading."
             )),
             type: "string"
         },
         order: {
             description: ( localize(
-                2630,
+                2670,
                 "When specified, gives the order of this category of settings relative to other categories."
             )),
             type: "integer"
         },
         properties: {
-            description: ( localize(2631, "Description of the configuration properties.")),
+            description: ( localize(2671, "Description of the configuration properties.")),
             type: "object",
             propertyNames: {
                 pattern: "\\S+",
-                patternErrorMessage: ( localize(2632, "Property should not be empty."))
+                patternErrorMessage: ( localize(2672, "Property should not be empty."))
             },
             additionalProperties: {
                 anyOf: [{
-                    title: ( localize(2633, "Schema of the configuration property.")),
+                    title: ( localize(2673, "Schema of the configuration property.")),
                     $ref: "http://json-schema.org/draft-07/schema#"
                 }, {
                     type: "object",
@@ -64,24 +64,24 @@ const configurationEntrySchema = {
                                 "machine-overridable"
                             ],
                             default: "window",
-                            enumDescriptions: [( localize(2634, "Configuration that can be configured only in the user settings.")), ( localize(
-                                2635,
+                            enumDescriptions: [( localize(2674, "Configuration that can be configured only in the user settings.")), ( localize(
+                                2675,
                                 "Configuration that can be configured only in the user settings or only in the remote settings."
                             )), ( localize(
-                                2636,
+                                2676,
                                 "Configuration that can be configured in the user, remote or workspace settings."
                             )), ( localize(
-                                2637,
+                                2677,
                                 "Configuration that can be configured in the user, remote, workspace or folder settings."
                             )), ( localize(
-                                2638,
+                                2678,
                                 "Resource configuration that can be configured in language specific settings."
                             )), ( localize(
-                                2639,
+                                2679,
                                 "Machine configuration that can be configured also in workspace or folder settings."
                             ))],
                             markdownDescription: ( localize(
-                                2640,
+                                2680,
                                 "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
                             ))
                         },
@@ -90,14 +90,14 @@ const configurationEntrySchema = {
                             items: {
                                 type: "string"
                             },
-                            description: ( localize(2641, "Descriptions for enum values"))
+                            description: ( localize(2681, "Descriptions for enum values"))
                         },
                         markdownEnumDescriptions: {
                             type: "array",
                             items: {
                                 type: "string"
                             },
-                            description: ( localize(2642, "Descriptions for enum values in the markdown format."))
+                            description: ( localize(2682, "Descriptions for enum values in the markdown format."))
                         },
                         enumItemLabels: {
                             type: "array",
@@ -105,53 +105,63 @@ const configurationEntrySchema = {
                                 type: "string"
                             },
                             markdownDescription: ( localize(
-                                2643,
+                                2683,
                                 "Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.",
                                 "`enum`"
                             ))
                         },
                         markdownDescription: {
                             type: "string",
-                            description: ( localize(2644, "The description in the markdown format."))
+                            description: ( localize(2684, "The description in the markdown format."))
                         },
                         deprecationMessage: {
                             type: "string",
                             description: ( localize(
-                                2645,
+                                2685,
                                 "If set, the property is marked as deprecated and the given message is shown as an explanation."
                             ))
                         },
                         markdownDeprecationMessage: {
                             type: "string",
                             description: ( localize(
-                                2646,
+                                2686,
                                 "If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format."
                             ))
                         },
                         editPresentation: {
                             type: "string",
                             enum: ["singlelineText", "multilineText"],
-                            enumDescriptions: [( localize(2647, "The value will be shown in an inputbox.")), ( localize(2648, "The value will be shown in a textarea."))],
+                            enumDescriptions: [( localize(2687, "The value will be shown in an inputbox.")), ( localize(2688, "The value will be shown in a textarea."))],
                             default: "singlelineText",
                             description: ( localize(
-                                2649,
+                                2689,
                                 "When specified, controls the presentation format of the string setting."
                             ))
                         },
                         order: {
                             type: "integer",
                             description: ( localize(
-                                2650,
+                                2690,
                                 "When specified, gives the order of this setting relative to other settings within the same category. Settings with an order property will be placed before settings without this property set."
                             ))
                         },
                         ignoreSync: {
                             type: "boolean",
                             description: ( localize(
-                                2651,
+                                2691,
                                 "When enabled, Settings Sync will not sync the user value of this configuration by default."
                             ))
                         },
+                        keywords: {
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            description: ( localize(
+                                2692,
+                                "A list of keywords that help users find this setting in the Settings editor. These are not shown to the user."
+                            ))
+                        },
                         tags: {
                             type: "array",
                             items: {
@@ -163,20 +173,20 @@ const configurationEntrySchema = {
                                     "telemetry",
                                     "usesOnlineServices"
                                 ],
-                                enumDescriptions: [( localize(2652, "Accessibility settings")), ( localize(
-                                    2653,
+                                enumDescriptions: [( localize(2693, "Accessibility settings")), ( localize(
+                                    2694,
                                     "Advanced settings are hidden by default in the Settings editor unless the user chooses to show advanced settings."
                                 )), ( localize(
-                                    2654,
+                                    2695,
                                     "Experimental settings are subject to change and may be removed in future releases."
                                 )), ( localize(
-                                    2655,
+                                    2696,
                                     "Preview settings can be used to try out new features before they are finalized."
-                                )), ( localize(2656, "Telemetry settings")), ( localize(2657, "Settings that use online services"))]
+                                )), ( localize(2697, "Telemetry settings")), ( localize(2698, "Settings that use online services"))]
                             },
                             additionalItems: true,
                             markdownDescription: ( localize(
-                                2658,
+                                2699,
                                 "A list of tags under which to place the setting. The tag can then be searched up in the Settings editor. For example, specifying the `experimental` tag allows one to find the setting by searching `@tag:experimental`."
                             ))
                         }
@@ -235,7 +245,7 @@ defaultConfigurationExtPoint.setHandler((
                 const registeredPropertyScheme = registeredProperties[key];
                 if (registeredPropertyScheme?.disallowConfigurationDefault) {
                     extension.collector.warn(( localize(
-                        2659,
+                        2700,
                         "Cannot register configuration defaults for '{0}'. This setting does not allow contributing configuration defaults.",
                         key
                     )));
@@ -245,7 +255,7 @@ defaultConfigurationExtPoint.setHandler((
                 if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
                     if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
                         extension.collector.warn(( localize(
-                            2660,
+                            2701,
                             "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
                             key
                         )));
@@ -269,7 +279,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "configuration",
     deps: [defaultConfigurationExtPoint],
     jsonSchema: {
-        description: ( localize(2661, "Contributes configuration settings.")),
+        description: ( localize(2702, "Contributes configuration settings.")),
         oneOf: [configurationEntrySchema, {
             type: "array",
             items: configurationEntrySchema
@@ -298,7 +308,7 @@ configurationExtPoint.setHandler((
     function handleConfiguration(node, extension) {
         const configuration = deepClone(node);
         if (configuration.title && (typeof configuration.title !== "string")) {
-            extension.collector.error(( localize(2662, "'configuration.title' must be a string")));
+            extension.collector.error(( localize(2703, "'configuration.title' must be a string")));
         }
         validateProperties(configuration, extension);
         configuration.id = node.id || extension.description.identifier.value;
@@ -315,7 +325,7 @@ configurationExtPoint.setHandler((
         const extensionConfigurationPolicy = product.extensionConfigurationPolicy;
         if (properties) {
             if (typeof properties !== "object") {
-                extension.collector.error(( localize(2663, "'configuration.properties' must be an object")));
+                extension.collector.error(( localize(2704, "'configuration.properties' must be an object")));
                 configuration.properties = {};
             }
             for (const key in properties) {
@@ -328,12 +338,12 @@ configurationExtPoint.setHandler((
                 }
                 if (( seenProperties.has(key)) && !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extension.description.identifier.value.toLowerCase()))) {
                     delete properties[key];
-                    extension.collector.warn(( localize(2664, "Cannot register '{0}'. This property is already registered.", key)));
+                    extension.collector.warn(( localize(2705, "Cannot register '{0}'. This property is already registered.", key)));
                     continue;
                 }
                 if (!isObject(propertyConfiguration)) {
                     delete properties[key];
-                    extension.collector.error(( localize(2665, "configuration.properties property '{0}' must be an object", key)));
+                    extension.collector.error(( localize(2706, "configuration.properties property '{0}' must be an object", key)));
                     continue;
                 }
                 if (extensionConfigurationPolicy?.[key]) {
@@ -351,7 +361,7 @@ configurationExtPoint.setHandler((
         const subNodes = configuration.allOf;
         if (subNodes) {
             extension.collector.error(( localize(
-                2666,
+                2707,
                 "'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."
             )));
             for (const node of subNodes) {
@@ -391,7 +401,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
         "folders": {
             minItems: 0,
             uniqueItems: true,
-            description: ( localize(2667, "List of folders to be loaded in the workspace.")),
+            description: ( localize(2708, "List of folders to be loaded in the workspace.")),
             items: {
                 type: "object",
                 defaultSnippets: [{
@@ -404,13 +414,13 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
                         path: {
                             type: "string",
                             description: ( localize(
-                                2668,
+                                2709,
                                 "A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file."
                             ))
                         },
                         name: {
                             type: "string",
-                            description: ( localize(2669, "An optional name for the folder. "))
+                            description: ( localize(2710, "An optional name for the folder. "))
                         }
                     },
                     required: ["path"]
@@ -418,11 +428,11 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
                     properties: {
                         uri: {
                             type: "string",
-                            description: ( localize(2670, "URI of the folder"))
+                            description: ( localize(2711, "URI of the folder"))
                         },
                         name: {
                             type: "string",
-                            description: ( localize(2669, "An optional name for the folder. "))
+                            description: ( localize(2710, "An optional name for the folder. "))
                         }
                     },
                     required: ["uri"]
@@ -432,7 +442,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
         "settings": {
             type: "object",
             default: {},
-            description: ( localize(2671, "Workspace settings")),
+            description: ( localize(2712, "Workspace settings")),
             $ref: workspaceSettingsSchemaId
         },
         "launch": {
@@ -441,7 +451,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
                 configurations: [],
                 compounds: []
             },
-            description: ( localize(2672, "Workspace launch configurations")),
+            description: ( localize(2713, "Workspace launch configurations")),
             $ref: launchSchemaId
         },
         "tasks": {
@@ -450,7 +460,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
                 version: "2.0.0",
                 tasks: []
             },
-            description: ( localize(2673, "Workspace task configurations")),
+            description: ( localize(2714, "Workspace task configurations")),
             $ref: tasksSchemaId
         },
         "mcp": {
@@ -464,27 +474,27 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
                     }
                 }
             },
-            description: ( localize(2674, "Model Context Protocol server configurations")),
+            description: ( localize(2715, "Model Context Protocol server configurations")),
             $ref: mcpSchemaId
         },
         "extensions": {
             type: "object",
             default: {},
-            description: ( localize(2675, "Workspace extensions")),
+            description: ( localize(2716, "Workspace extensions")),
             $ref: "vscode://schemas/extensions"
         },
         "remoteAuthority": {
             type: "string",
             doNotSuggest: true,
-            description: ( localize(2676, "The remote server where the workspace is located."))
+            description: ( localize(2717, "The remote server where the workspace is located."))
         },
         "transient": {
             type: "boolean",
             doNotSuggest: true,
-            description: ( localize(2677, "A transient workspace will disappear when restarting or reloading."))
+            description: ( localize(2718, "A transient workspace will disappear when restarting or reloading."))
         }
     },
-    errorMessage: ( localize(2678, "Unknown workspace configuration property"))
+    errorMessage: ( localize(2719, "Unknown workspace configuration property"))
 });
 class SettingsTableRenderer extends Disposable {
     constructor() {
@@ -498,7 +508,7 @@ class SettingsTableRenderer extends Disposable {
         const configuration = manifest.contributes?.configuration ? Array.isArray(manifest.contributes.configuration) ? manifest.contributes.configuration : [manifest.contributes.configuration] : [];
         const properties = getAllConfigurationProperties(configuration);
         const contrib = properties ? ( Object.keys(properties)) : [];
-        const headers = [( localize(2679, "ID")), ( localize(2680, "Description")), ( localize(2681, "Default"))];
+        const headers = [( localize(2720, "ID")), ( localize(2721, "Description")), ( localize(2722, "Default"))];
         const rows = ( contrib.sort((a, b) => a.localeCompare(b)).map(key => {
             return [( new MarkdownString()).appendMarkdown(`\`${key}\``), properties[key].markdownDescription ? ( new MarkdownString(properties[key].markdownDescription, false)) : properties[key].description ?? "", ( new MarkdownString()).appendCodeblock("json", JSON.stringify(
                 isUndefined(properties[key].default) ? getDefaultValue(properties[key].type) : properties[key].default,
@@ -517,7 +527,7 @@ class SettingsTableRenderer extends Disposable {
 }
 ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "configuration",
-    label: ( localize(2682, "Settings")),
+    label: ( localize(2723, "Settings")),
     access: {
         canToggle: false
     },
@@ -533,7 +543,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
     }
     render(manifest) {
         const configurationDefaults = manifest.contributes?.configurationDefaults ?? {};
-        const headers = [( localize(2683, "Languages")), ( localize(2684, "Setting")), ( localize(2685, "Override Value"))];
+        const headers = [( localize(2724, "Languages")), ( localize(2725, "Setting")), ( localize(2726, "Override Value"))];
         const rows = [];
         for (const key of ( Object.keys(configurationDefaults)).sort((a, b) => a.localeCompare(b))) {
             const value = configurationDefaults[key];
@@ -566,7 +576,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
 }
 ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "configurationDefaults",
-    label: ( localize(2686, "Settings Default Overrides")),
+    label: ( localize(2727, "Settings Default Overrides")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js

@@ -62,12 +62,12 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         if (workspaces.length === 1) {
             const workspaceFile = workspaces[0];
             this.notificationService.prompt(Severity.Info, ( localize(
-                14150,
+                15077,
                 "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.",
                 workspaceFile,
                 "https://go.microsoft.com/fwlink/?linkid=2025315"
             )), [{
-                label: ( localize(14151, "Open Workspace")),
+                label: ( localize(15078, "Open Workspace")),
                 run: () => this.hostService.openWindow([{
                     workspaceUri: joinPath(folder, workspaceFile)
                 }])
@@ -78,16 +78,16 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         }
         else if (workspaces.length > 1) {
             this.notificationService.prompt(Severity.Info, ( localize(
-                14152,
+                15079,
                 "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.",
                 "https://go.microsoft.com/fwlink/?linkid=2025315"
             )), [{
-                label: ( localize(14153, "Select Workspace")),
+                label: ( localize(15080, "Select Workspace")),
                 run: () => {
                     this.quickInputService.pick(( workspaces.map(workspace => ({
                         label: workspace
                     }))), {
-                        placeHolder: ( localize(14154, "Select a workspace to open"))
+                        placeHolder: ( localize(15081, "Select a workspace to open"))
                     }).then(pick => {
                         if (pick) {
                             this.hostService.openWindow([{
@@ -109,7 +109,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.openWorkspaceFromEditor",
-            title: ( localize2(14151, "Open Workspace")),
+            title: ( localize2(15078, "Open Workspace")),
             f1: false,
             menu: {
                 id: MenuId.EditorContent,
@@ -124,7 +124,7 @@ registerAction2(class extends Action2 {
         if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             const workspaceConfiguration = contextService.getWorkspace().configuration;
             if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
-                notificationService.info(( localize(14155, "This workspace is already open.")));
+                notificationService.info(( localize(15082, "This workspace is already open.")));
                 return;
             }
         }

package/vscode/src/vs/workbench/services/configuration/browser/configurationService.d.ts

@@ -21,7 +21,6 @@ declare class Workspace extends BaseWorkspace {
     initialized: boolean;
 }
 export declare class WorkspaceService extends Disposable implements IWorkbenchConfigurationService, IWorkspaceContextService {
-    private readonly environmentService;
     private readonly userDataProfileService;
     private readonly userDataProfilesService;
     private readonly fileService;

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 } 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 } 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';
@@ -71,7 +71,6 @@ class WorkspaceService extends Disposable {
         policyService
     ) {
         super();
-        this.environmentService = environmentService;
         this.userDataProfileService = userDataProfileService;
         this.userDataProfilesService = userDataProfilesService;
         this.fileService = fileService;
@@ -489,14 +488,12 @@ class WorkspaceService extends Disposable {
             this.uriIdentityService.extUri
         );
         const workspaceId = workspaceIdentifier.id;
-        const isAgentSessionsWorkspace = this.uriIdentityService.extUri.isEqual(workspaceConfigPath, this.environmentService.agentSessionsWorkspace);
         const workspace = ( new Workspace(
             workspaceId,
             workspaceFolders,
             this.workspaceConfiguration.isTransient(),
             workspaceConfigPath,
-            uri => this.uriIdentityService.extUri.ignorePathCasing(uri),
-            isAgentSessionsWorkspace
+            uri => this.uriIdentityService.extUri.ignorePathCasing(uri)
         ));
         workspace.initialized = this.workspaceConfiguration.initialized;
         return workspace;
@@ -1324,7 +1321,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
         } : workspaceSettingsSchema;
         const configDefaultsSchema = {
             type: "object",
-            description: ( localize(14334, "Contribute defaults for configurations")),
+            description: ( localize(15262, "Contribute defaults for configurations")),
             properties: Object.assign(
                 {},
                 this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
@@ -1427,11 +1424,18 @@ let ConfigurationDefaultOverridesContribution = class ConfigurationDefaultOverri
     async processExperimentalSettings(properties, autoRefetch) {
         const overrides = {};
         const allProperties = this.configurationRegistry.getConfigurationProperties();
+        const defaultConfigurationsPreventingExperimentOverrides = this.configurationRegistry.getRegisteredDefaultConfigurations().filter(configuration => configuration.preventExperimentOverride);
         for (const property of properties) {
             const schema = allProperties[property];
             if (!schema?.experiment) {
                 continue;
             }
+            const defaultValueSource = schema.defaultValueSource && !(schema.defaultValueSource instanceof Map) ? schema.defaultValueSource : undefined;
+            if (defaultValueSource && ( defaultConfigurationsPreventingExperimentOverrides.some(
+                configuration => isConfigurationDefaultSourceEquals(configuration.source, defaultValueSource) && configuration.overrides?.[property] !== undefined
+            ))) {
+                continue;
+            }
             if (!autoRefetch && ( this.processedExperimentalSettings.has(property))) {
                 continue;
             }
@@ -1467,7 +1471,7 @@ configurationRegistry.registerConfiguration({
     properties: {
         [APPLY_ALL_PROFILES_SETTING]: {
             "type": "array",
-            description: ( localize(14335, "Configure settings to be applied for all profiles.")),
+            description: ( localize(15263, "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(
-                14336,
+                15264,
                 "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(14337, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(14338, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(14339, "Open MCP Configuration")) : null;
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15265, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15266, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(15267, "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(14340, "Open Settings")),
+                label: ( localize(15268, "Open Settings")),
                 run: () => this.openSettings(operation)
             }]);
         }
     }
     onConfigurationFileDirtyError(error, operation, scopes) {
-        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(14337, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(14338, "Open Launch Configuration")) : null;
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15265, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15266, "Open Launch Configuration")) : null;
         if (openStandAloneConfigurationActionLabel) {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                label: ( localize(14341, "Save and Retry")),
+                label: ( localize(15269, "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(14341, "Save and Retry")),
+                label: ( localize(15269, "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(14340, "Open Settings")),
+                label: ( localize(15268, "Open Settings")),
                 run: () => this.openSettings(operation)
             }]);
         }
@@ -335,61 +335,61 @@ let ConfigurationEditing = class ConfigurationEditing {
         switch (error) {
         case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION:
             return localize(
-                14342,
+                15270,
                 "Unable to write {0} because it is configured in system policy.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY:
             return localize(
-                14343,
+                15271,
                 "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(
-                14344,
+                15272,
                 "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(
-                14345,
+                15273,
                 "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(
-                14346,
+                15274,
                 "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(
-                14347,
+                15275,
                 "Unable to write to User Settings because {0} does not support for global scope.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET:
             return localize(
-                14348,
+                15276,
                 "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(
-                14349,
+                15277,
                 "Unable to write to Folder Settings because no resource is provided."
             );
         case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION:
             return localize(
-                14350,
+                15278,
                 "Unable to write to Language Settings because {0} is not a resource language setting.",
                 operation.key
             );
         case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED:
             return localize(
-                14351,
+                15279,
                 "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(
-                        14352,
+                        15280,
                         "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(
-                        14353,
+                        15281,
                         "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(
-                        14354,
+                        15282,
                         "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(
-                        14355,
+                        15283,
                         "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(
-                        14356,
+                        15284,
                         "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(
-                        14357,
+                        15285,
                         "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(
-                            14358,
+                            15286,
                             "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(
-                        14359,
+                        15287,
                         "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(
-                        14360,
+                        15288,
                         "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(
-                        14361,
+                        15289,
                         "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(
-                        14362,
+                        15290,
                         "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(
-                        14363,
+                        15291,
                         "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(
-                        14364,
+                        15292,
                         "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(
-                            14365,
+                            15293,
                             "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(
-                    14366,
+                    15294,
                     "Unable to write into tasks configuration file because the content of the file is newer."
                 );
             }
             if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
                 return localize(
-                    14367,
+                    15295,
                     "Unable to write into launch configuration file because the content of the file is newer."
                 );
             }
             if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
                 return localize(
-                    14368,
+                    15296,
                     "Unable to write into MCP configuration file because the content of the file is newer."
                 );
             }
             switch (target) {
             case EditableConfigurationTarget.USER_LOCAL:
                 return localize(
-                    14369,
+                    15297,
                     "Unable to write into user settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.USER_REMOTE:
                 return localize(
-                    14370,
+                    15298,
                     "Unable to write into remote user settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.WORKSPACE:
                 return localize(
-                    14371,
+                    15299,
                     "Unable to write into workspace settings because the content of the file is newer."
                 );
             case EditableConfigurationTarget.WORKSPACE_FOLDER:
                 return localize(
-                    14372,
+                    15300,
                     "Unable to write into folder settings because the content of the file is newer."
                 );
             }
         case ConfigurationEditingErrorCode.ERROR_INTERNAL:
             return localize(
-                14373,
+                15301,
                 "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(14374, "User Settings");
+            return localize(15302, "User Settings");
         case EditableConfigurationTarget.USER_REMOTE:
-            return localize(14375, "Remote User Settings");
+            return localize(15303, "Remote User Settings");
         case EditableConfigurationTarget.WORKSPACE:
-            return localize(14376, "Workspace Settings");
+            return localize(15304, "Workspace Settings");
         case EditableConfigurationTarget.WORKSPACE_FOLDER:
-            return localize(14377, "Folder Settings");
+            return localize(15305, "Folder Settings");
         default:
             return "";
         }

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js

@@ -134,7 +134,10 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
     }
     async resolveWithInteractionReplace(folder, config, section, variables, target) {
         const parsed = ConfigurationResolverExpression.parse(config);
-        await this.resolveWithInteraction(folder, parsed, section, variables, target);
+        const resolved = await this.resolveWithInteraction(folder, parsed, section, variables, target);
+        if (resolved === undefined) {
+            return undefined;
+        }
         return parsed.toObject();
     }
     async resolveWithInteraction(folder, config, section, variableToCommandMap, target) {
@@ -147,7 +150,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 if (!isUndefinedOrNull(value)) {
                     if (typeof value !== "string") {
                         throw ( new VariableError(VariableKind.Command, ( localize(
-                            14379,
+                            15307,
                             "Cannot substitute command variable '{0}' because command did not return a result of type string.",
                             commandId
                         ))));
@@ -247,7 +250,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
     async showUserInput(section, variable, inputInfos, variableToCommandMap) {
         if (!inputInfos) {
             throw ( new VariableError(VariableKind.Input, ( localize(
-                14380,
+                15308,
                 "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
                 variable,
                 "inputs"
@@ -257,7 +260,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
         if (info) {
             const missingAttribute = attrName => {
                 throw ( new VariableError(VariableKind.Input, ( localize(
-                    14381,
+                    15309,
                     "Input variable '{0}' is of type '{1}' and must include '{2}'.",
                     variable,
                     info.type,
@@ -315,7 +318,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                         };
                         const topValue = variableToCommandMap?.[`input:${variable}`] ?? previousPickedValue ?? info.default;
                         if (value === info.default) {
-                            item.description = ( localize(14382, "(Default)"));
+                            item.description = ( localize(15310, "(Default)"));
                             picks.unshift(item);
                         } else if (value === topValue) {
                             picks.unshift(item);
@@ -353,7 +356,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             };
                         }
                         throw ( new VariableError(VariableKind.Input, ( localize(
-                            14383,
+                            15311,
                             "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
                             variable,
                             info.command
@@ -362,14 +365,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 }
             default:
                 throw ( new VariableError(VariableKind.Input, ( localize(
-                    14384,
+                    15312,
                     "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
                     variable
                 ))));
             }
         }
         throw ( new VariableError(VariableKind.Input, ( localize(
-            14385,
+            15313,
             "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
             variable
         ))));

package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.d.ts

@@ -1,6 +1,7 @@
+import { IDidEnterWorkspaceEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workspaces/common/workspaceEditing";
 import { IWorkspaceEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
+import { IAnyWorkspaceIdentifier, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IJSONEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
 import { IWorkspaceFolderCreationData, IEnterWorkspaceResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces";
 import { IWorkspacesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service";
@@ -19,6 +20,16 @@ import { IWorkbenchConfigurationService } from "@codingame/monaco-vscode-api/vsc
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+export declare class DidEnterWorkspaceEvent implements IDidEnterWorkspaceEvent {
+    readonly oldWorkspace: IAnyWorkspaceIdentifier;
+    readonly newWorkspace: IAnyWorkspaceIdentifier;
+    private readonly promises;
+    constructor(oldWorkspace: IAnyWorkspaceIdentifier, newWorkspace: IAnyWorkspaceIdentifier);
+    join(promise: Promise<void>): void;
+    wait(): Promise<void>;
+}
 export declare abstract class AbstractWorkspaceEditingService extends Disposable implements IWorkspaceEditingService {
     private readonly jsonEditingService;
     protected readonly contextService: WorkspaceService;
@@ -36,8 +47,11 @@ export declare abstract class AbstractWorkspaceEditingService extends Disposable
     private readonly workspaceTrustManagementService;
     private readonly userDataProfilesService;
     private readonly userDataProfileService;
+    protected readonly logService: ILogService;
     readonly _serviceBrand: undefined;
-    constructor(jsonEditingService: IJSONEditingService, contextService: WorkspaceService, configurationService: IWorkbenchConfigurationService, notificationService: INotificationService, commandService: ICommandService, fileService: IFileService, textFileService: ITextFileService, workspacesService: IWorkspacesService, environmentService: IWorkbenchEnvironmentService, fileDialogService: IFileDialogService, dialogService: IDialogService, hostService: IHostService, uriIdentityService: IUriIdentityService, workspaceTrustManagementService: IWorkspaceTrustManagementService, userDataProfilesService: IUserDataProfilesService, userDataProfileService: IUserDataProfileService);
+    private readonly _onDidEnterWorkspace;
+    readonly onDidEnterWorkspace: Event<IDidEnterWorkspaceEvent>;
+    constructor(jsonEditingService: IJSONEditingService, contextService: WorkspaceService, configurationService: IWorkbenchConfigurationService, notificationService: INotificationService, commandService: ICommandService, fileService: IFileService, textFileService: ITextFileService, workspacesService: IWorkspacesService, environmentService: IWorkbenchEnvironmentService, fileDialogService: IFileDialogService, dialogService: IDialogService, hostService: IHostService, uriIdentityService: IUriIdentityService, workspaceTrustManagementService: IWorkspaceTrustManagementService, userDataProfilesService: IUserDataProfilesService, userDataProfileService: IUserDataProfileService, logService: ILogService);
     pickNewWorkspacePath(): Promise<URI | undefined>;
     private getNewWorkspaceName;
     updateFolders(index: number, deleteCount?: number, foldersToAddCandidates?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): Promise<void>;
@@ -55,6 +69,7 @@ export declare abstract class AbstractWorkspaceEditingService extends Disposable
     private onInvalidWorkspaceConfigurationFileError;
     private askToOpenWorkspaceConfigurationFile;
     abstract enterWorkspace(workspaceUri: URI): Promise<void>;
+    protected fireDidEnterWorkspace(oldWorkspace: IAnyWorkspaceIdentifier, newWorkspace: IAnyWorkspaceIdentifier): Promise<void>;
     protected doEnterWorkspace(workspaceUri: URI): Promise<IEnterWorkspaceResult | undefined>;
     private migrateWorkspaceSettings;
     copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): Promise<void>;

package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js

@@ -27,8 +27,24 @@ import { IWorkbenchConfigurationService } from '@codingame/monaco-vscode-api/vsc
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
+class DidEnterWorkspaceEvent {
+    constructor(oldWorkspace, newWorkspace) {
+        this.oldWorkspace = oldWorkspace;
+        this.newWorkspace = newWorkspace;
+        this.promises = [];
+    }
+    join(promise) {
+        this.promises.push(promise);
+    }
+    async wait() {
+        await Promises.settled(this.promises);
+    }
+}
 let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService extends Disposable {
     constructor(
         jsonEditingService,
@@ -46,7 +62,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         uriIdentityService,
         workspaceTrustManagementService,
         userDataProfilesService,
-        userDataProfileService
+        userDataProfileService,
+        logService
     ) {
         super();
         this.jsonEditingService = jsonEditingService;
@@ -65,6 +82,9 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         this.workspaceTrustManagementService = workspaceTrustManagementService;
         this.userDataProfilesService = userDataProfilesService;
         this.userDataProfileService = userDataProfileService;
+        this.logService = logService;
+        this._onDidEnterWorkspace = this._register(( new Emitter()));
+        this.onDidEnterWorkspace = this._onDidEnterWorkspace.event;
     }
     async pickNewWorkspacePath() {
         const availableFileSystems = [Schemas.file];
@@ -72,8 +92,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             availableFileSystems.unshift(Schemas.vscodeRemote);
         }
         let workspacePath = await this.fileDialogService.showSaveDialog({
-            saveLabel: ( localize(15248, "Save")),
-            title: ( localize(15249, "Save Workspace")),
+            saveLabel: ( localize(16175, "Save")),
+            title: ( localize(16176, "Save Workspace")),
             filters: WORKSPACE_FILTER,
             defaultUri: joinPath(
                 await this.fileDialogService.defaultWorkspacePath(),
@@ -303,17 +323,29 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     onInvalidWorkspaceConfigurationFileError() {
         const message = ( localize(
-            15250,
+            16177,
             "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
         ));
         this.askToOpenWorkspaceConfigurationFile(message);
     }
     askToOpenWorkspaceConfigurationFile(message) {
         this.notificationService.prompt(Severity.Error, message, [{
-            label: ( localize(15251, "Open Workspace Configuration")),
+            label: ( localize(16178, "Open Workspace Configuration")),
             run: () => this.commandService.executeCommand("workbench.action.openWorkspaceConfigFile")
         }]);
     }
+    async fireDidEnterWorkspace(oldWorkspace, newWorkspace) {
+        const event = ( new DidEnterWorkspaceEvent(oldWorkspace, newWorkspace));
+        this._onDidEnterWorkspace.fire(event);
+        try {
+            await event.wait();
+        } catch (error) {
+            this.logService.error(
+                "Error while waiting for participants of onDidEnterWorkspace to join:",
+                error
+            );
+        }
+    }
     async doEnterWorkspace(workspaceUri) {
         if (this.environmentService.extensionTestsLocationURI) {
             throw ( new Error("Entering a new workspace is not possible in tests."));
@@ -360,6 +392,6 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         return undefined;
     }
 };
-AbstractWorkspaceEditingService = ( __decorate([( __param(0, IJSONEditingService)), ( __param(1, IWorkspaceContextService)), ( __param(2, IWorkbenchConfigurationService)), ( __param(3, INotificationService)), ( __param(4, ICommandService)), ( __param(5, IFileService)), ( __param(6, ITextFileService)), ( __param(7, IWorkspacesService)), ( __param(8, IWorkbenchEnvironmentService)), ( __param(9, IFileDialogService)), ( __param(10, IDialogService)), ( __param(11, IHostService)), ( __param(12, IUriIdentityService)), ( __param(13, IWorkspaceTrustManagementService)), ( __param(14, IUserDataProfilesService)), ( __param(15, IUserDataProfileService))], AbstractWorkspaceEditingService));
+AbstractWorkspaceEditingService = ( __decorate([( __param(0, IJSONEditingService)), ( __param(1, IWorkspaceContextService)), ( __param(2, IWorkbenchConfigurationService)), ( __param(3, INotificationService)), ( __param(4, ICommandService)), ( __param(5, IFileService)), ( __param(6, ITextFileService)), ( __param(7, IWorkspacesService)), ( __param(8, IWorkbenchEnvironmentService)), ( __param(9, IFileDialogService)), ( __param(10, IDialogService)), ( __param(11, IHostService)), ( __param(12, IUriIdentityService)), ( __param(13, IWorkspaceTrustManagementService)), ( __param(14, IUserDataProfilesService)), ( __param(15, IUserDataProfileService)), ( __param(16, ILogService))], AbstractWorkspaceEditingService));
 
-export { AbstractWorkspaceEditingService };
+export { AbstractWorkspaceEditingService, DidEnterWorkspaceEvent };