@codingame/monaco-vscode-configuration-service-override 13.1.7 → 14.0.0

package/index.d.ts

@@ -4,7 +4,7 @@ import type { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscod
 import { ConfigurationScope, type IConfigurationDefaults, type IConfigurationNode, type IConfigurationRegistry } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry";
 import type { IFileWriteOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
 import type { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
-import type { IStoredWorkspace, IWorkspaceFolderCreationData } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import type { IStoredWorkspace, IWorkspaceFolderCreationData } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import type { IColorCustomizations, IThemeScopedColorCustomizations } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 declare const defaultUserConfigurationFile: URI;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "13.1.7",
+  "version": "14.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - configuration service-override",
   "keywords": [],
@@ -15,14 +15,14 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common": "13.1.7",
-    "@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "13.1.7",
-    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "13.1.7",
-    "@codingame/monaco-vscode-api": "13.1.7",
-    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "13.1.7",
-    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "13.1.7",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "13.1.7",
-    "@codingame/monaco-vscode-files-service-override": "13.1.7"
+    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.0",
+    "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.0",
+    "@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "14.0.0",
+    "@codingame/monaco-vscode-api": "14.0.0",
+    "@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common": "14.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "14.0.0",
+    "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.0",
+    "@codingame/monaco-vscode-files-service-override": "14.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -5,7 +5,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { Extensions as Extensions$1, configurationDefaultsSchemaId, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, validateProperty, parseScope, getAllConfigurationProperties, getDefaultValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { tasksSchemaId, launchSchemaId, workspaceSettingsSchemaId } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { tasksSchemaId, launchSchemaId, workspaceSettingsSchemaId } from '@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { isObject, isUndefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { ExtensionIdentifierMap } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
@@ -21,29 +21,29 @@ const configurationEntrySchema = {
     properties: {
         title: {
             description: ( localize(
-                2388,
+                2428,
                 '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(
-                2389,
+                2429,
                 'When specified, gives the order of this category of settings relative to other categories.'
             )),
             type: 'integer'
         },
         properties: {
-            description: ( localize(2390, 'Description of the configuration properties.')),
+            description: ( localize(2430, 'Description of the configuration properties.')),
             type: 'object',
             propertyNames: {
                 pattern: '\\S+',
-                patternErrorMessage: ( localize(2391, 'Property should not be empty.')),
+                patternErrorMessage: ( localize(2431, 'Property should not be empty.')),
             },
             additionalProperties: {
                 anyOf: [
                     {
-                        title: ( localize(2392, 'Schema of the configuration property.')),
+                        title: ( localize(2432, 'Schema of the configuration property.')),
                         $ref: 'http://json-schema.org/draft-07/schema#'
                     },
                     {
@@ -54,30 +54,30 @@ const configurationEntrySchema = {
                                 enum: ['application', 'machine', 'window', 'resource', 'language-overridable', 'machine-overridable'],
                                 default: 'window',
                                 enumDescriptions: [
-                                    ( localize(2393, "Configuration that can be configured only in the user settings.")),
+                                    ( localize(2433, "Configuration that can be configured only in the user settings.")),
                                     ( localize(
-                                    2394,
+                                    2434,
                                     "Configuration that can be configured only in the user settings or only in the remote settings."
                                 )),
                                     ( localize(
-                                    2395,
+                                    2435,
                                     "Configuration that can be configured in the user, remote or workspace settings."
                                 )),
                                     ( localize(
-                                    2396,
+                                    2436,
                                     "Configuration that can be configured in the user, remote, workspace or folder settings."
                                 )),
                                     ( localize(
-                                    2397,
+                                    2437,
                                     "Resource configuration that can be configured in language specific settings."
                                 )),
                                     ( localize(
-                                    2398,
+                                    2438,
                                     "Machine configuration that can be configured also in workspace or folder settings."
                                 ))
                                 ],
                                 markdownDescription: ( localize(
-                                    2399,
+                                    2439,
                                     "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
                                 ))
                             },
@@ -86,14 +86,14 @@ const configurationEntrySchema = {
                                 items: {
                                     type: 'string',
                                 },
-                                description: ( localize(2400, 'Descriptions for enum values'))
+                                description: ( localize(2440, 'Descriptions for enum values'))
                             },
                             markdownEnumDescriptions: {
                                 type: 'array',
                                 items: {
                                     type: 'string',
                                 },
-                                description: ( localize(2401, 'Descriptions for enum values in the markdown format.'))
+                                description: ( localize(2441, 'Descriptions for enum values in the markdown format.'))
                             },
                             enumItemLabels: {
                                 type: 'array',
@@ -101,26 +101,26 @@ const configurationEntrySchema = {
                                     type: 'string'
                                 },
                                 markdownDescription: ( localize(
-                                    2402,
+                                    2442,
                                     '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(2403, 'The description in the markdown format.'))
+                                description: ( localize(2443, 'The description in the markdown format.'))
                             },
                             deprecationMessage: {
                                 type: 'string',
                                 description: ( localize(
-                                    2404,
+                                    2444,
                                     'If set, the property is marked as deprecated and the given message is shown as an explanation.'
                                 ))
                             },
                             markdownDeprecationMessage: {
                                 type: 'string',
                                 description: ( localize(
-                                    2405,
+                                    2445,
                                     'If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format.'
                                 ))
                             },
@@ -128,29 +128,39 @@ const configurationEntrySchema = {
                                 type: 'string',
                                 enum: ['singlelineText', 'multilineText'],
                                 enumDescriptions: [
-                                    ( localize(2406, 'The value will be shown in an inputbox.')),
-                                    ( localize(2407, 'The value will be shown in a textarea.'))
+                                    ( localize(2446, 'The value will be shown in an inputbox.')),
+                                    ( localize(2447, 'The value will be shown in a textarea.'))
                                 ],
                                 default: 'singlelineText',
                                 description: ( localize(
-                                    2408,
+                                    2448,
                                     'When specified, controls the presentation format of the string setting.'
                                 ))
                             },
                             order: {
                                 type: 'integer',
                                 description: ( localize(
-                                    2409,
+                                    2449,
                                     '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(
-                                    2410,
+                                    2450,
                                     'When enabled, Settings Sync will not sync the user value of this configuration by default.'
                                 ))
                             },
+                            tags: {
+                                type: 'array',
+                                items: {
+                                    type: 'string'
+                                },
+                                markdownDescription: ( localize(
+                                    2451,
+                                    'A list of categories under which to place the setting. The category 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`.'
+                                )),
+                            }
                         }
                     }
                 ]
@@ -192,7 +202,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
                 const registeredPropertyScheme = registeredProperties[key];
                 if (registeredPropertyScheme?.disallowConfigurationDefault) {
                     extension.collector.warn(( localize(
-                        2411,
+                        2452,
                         "Cannot register configuration defaults for '{0}'. This setting does not allow contributing configuration defaults.",
                         key
                     )));
@@ -202,7 +212,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
                 if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
                     if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
                         extension.collector.warn(( localize(
-                            2412,
+                            2453,
                             "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
                             key
                         )));
@@ -220,7 +230,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'configuration',
     deps: [defaultConfigurationExtPoint],
     jsonSchema: {
-        description: ( localize(2413, 'Contributes configuration settings.')),
+        description: ( localize(2454, 'Contributes configuration settings.')),
         oneOf: [
             configurationEntrySchema,
             {
@@ -246,7 +256,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
     function handleConfiguration(node, extension) {
         const configuration = deepClone(node);
         if (configuration.title && (typeof configuration.title !== 'string')) {
-            extension.collector.error(( localize(2414, "'configuration.title' must be a string")));
+            extension.collector.error(( localize(2455, "'configuration.title' must be a string")));
         }
         validateProperties(configuration, extension);
         configuration.id = node.id || extension.description.identifier.value;
@@ -259,7 +269,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
         const properties = configuration.properties;
         if (properties) {
             if (typeof properties !== 'object') {
-                extension.collector.error(( localize(2415, "'configuration.properties' must be an object")));
+                extension.collector.error(( localize(2456, "'configuration.properties' must be an object")));
                 configuration.properties = {};
             }
             for (const key in properties) {
@@ -272,12 +282,12 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
                 }
                 if (( seenProperties.has(key))) {
                     delete properties[key];
-                    extension.collector.warn(( localize(2416, "Cannot register '{0}'. This property is already registered.", key)));
+                    extension.collector.warn(( localize(2457, "Cannot register '{0}'. This property is already registered.", key)));
                     continue;
                 }
                 if (!isObject(propertyConfiguration)) {
                     delete properties[key];
-                    extension.collector.error(( localize(2417, "configuration.properties property '{0}' must be an object", key)));
+                    extension.collector.error(( localize(2458, "configuration.properties property '{0}' must be an object", key)));
                     continue;
                 }
                 seenProperties.add(key);
@@ -287,7 +297,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
         const subNodes = configuration.allOf;
         if (subNodes) {
             extension.collector.error(( localize(
-                2418,
+                2459,
                 "'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) {
@@ -330,7 +340,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
         'folders': {
             minItems: 0,
             uniqueItems: true,
-            description: ( localize(2419, "List of folders to be loaded in the workspace.")),
+            description: ( localize(2460, "List of folders to be loaded in the workspace.")),
             items: {
                 type: 'object',
                 defaultSnippets: [{ body: { path: '$1' } }],
@@ -339,13 +349,13 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
                             path: {
                                 type: 'string',
                                 description: ( localize(
-                                    2420,
+                                    2461,
                                     "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(2421, "An optional name for the folder. "))
+                                description: ( localize(2462, "An optional name for the folder. "))
                             }
                         },
                         required: ['path']
@@ -353,11 +363,11 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
                         properties: {
                             uri: {
                                 type: 'string',
-                                description: ( localize(2422, "URI of the folder"))
+                                description: ( localize(2463, "URI of the folder"))
                             },
                             name: {
                                 type: 'string',
-                                description: ( localize(2421, "An optional name for the folder. "))
+                                description: ( localize(2462, "An optional name for the folder. "))
                             }
                         },
                         required: ['uri']
@@ -367,39 +377,39 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
         'settings': {
             type: 'object',
             default: {},
-            description: ( localize(2423, "Workspace settings")),
+            description: ( localize(2464, "Workspace settings")),
             $ref: workspaceSettingsSchemaId
         },
         'launch': {
             type: 'object',
             default: { configurations: [], compounds: [] },
-            description: ( localize(2424, "Workspace launch configurations")),
+            description: ( localize(2465, "Workspace launch configurations")),
             $ref: launchSchemaId
         },
         'tasks': {
             type: 'object',
             default: { version: '2.0.0', tasks: [] },
-            description: ( localize(2425, "Workspace task configurations")),
+            description: ( localize(2466, "Workspace task configurations")),
             $ref: tasksSchemaId
         },
         'extensions': {
             type: 'object',
             default: {},
-            description: ( localize(2426, "Workspace extensions")),
+            description: ( localize(2467, "Workspace extensions")),
             $ref: 'vscode://schemas/extensions'
         },
         'remoteAuthority': {
             type: 'string',
             doNotSuggest: true,
-            description: ( localize(2427, "The remote server where the workspace is located.")),
+            description: ( localize(2468, "The remote server where the workspace is located.")),
         },
         'transient': {
             type: 'boolean',
             doNotSuggest: true,
-            description: ( localize(2428, "A transient workspace will disappear when restarting or reloading.")),
+            description: ( localize(2469, "A transient workspace will disappear when restarting or reloading.")),
         }
     },
-    errorMessage: ( localize(2429, "Unknown workspace configuration property"))
+    errorMessage: ( localize(2470, "Unknown workspace configuration property"))
 });
 class SettingsTableRenderer extends Disposable {
     constructor() {
@@ -415,7 +425,7 @@ class SettingsTableRenderer extends Disposable {
             : [];
         const properties = getAllConfigurationProperties(configuration);
         const contrib = properties ? ( Object.keys(properties)) : [];
-        const headers = [( localize(2430, "ID")), ( localize(2431, "Description")), ( localize(2432, "Default"))];
+        const headers = [( localize(2471, "ID")), ( localize(2472, "Description")), ( localize(2473, "Default"))];
         const rows = ( contrib.sort((a, b) => a.localeCompare(b))
             .map(key => {
             return [
@@ -435,7 +445,7 @@ class SettingsTableRenderer extends Disposable {
 }
 ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'configuration',
-    label: ( localize(2433, "Settings")),
+    label: ( localize(2474, "Settings")),
     access: {
         canToggle: false
     },

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

@@ -15,11 +15,11 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { isVirtualWorkspace } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/workspace/common/virtualWorkspace';
+import { isVirtualWorkspace } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ResourceContextKey, ActiveEditorContext, TemporaryWorkspaceContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common/vscode/vs/workbench/contrib/files/common/files';
+import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common/vscode/vs/workbench/contrib/files/common/files';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Disposable {
@@ -51,12 +51,12 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         if (workspaces.length === 1) {
             const workspaceFile = workspaces[0];
             this.notificationService.prompt(Severity.Info, ( localize(
-                11135,
+                11330,
                 "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(11136, "Open Workspace")),
+                    label: ( localize(11331, "Open Workspace")),
                     run: () => this.hostService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
                 }], {
                 neverShowAgain,
@@ -65,13 +65,13 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         }
         else if (workspaces.length > 1) {
             this.notificationService.prompt(Severity.Info, ( localize(
-                11137,
+                11332,
                 "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(11138, "Select Workspace")),
+                    label: ( localize(11333, "Select Workspace")),
                     run: () => {
-                        this.quickInputService.pick(( workspaces.map(workspace => ({ label: workspace }))), { placeHolder: ( localize(11139, "Select a workspace to open")) }).then(pick => {
+                        this.quickInputService.pick(( workspaces.map(workspace => ({ label: workspace }))), { placeHolder: ( localize(11334, "Select a workspace to open")) }).then(pick => {
                             if (pick) {
                                 this.hostService.openWindow([{ workspaceUri: joinPath(folder, pick.label) }]);
                             }
@@ -97,7 +97,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.openWorkspaceFromEditor',
-            title: ( localize2(11136, "Open Workspace")),
+            title: ( localize2(11331, "Open Workspace")),
             f1: false,
             menu: {
                 id: MenuId.EditorContent,
@@ -112,7 +112,7 @@ registerAction2(class extends Action2 {
         if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             const workspaceConfiguration = contextService.getWorkspace().configuration;
             if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
-                notificationService.info(( localize(11140, "This workspace is already open.")));
+                notificationService.info(( localize(11335, "This workspace is already open.")));
                 return;
             }
         }

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

@@ -3,8 +3,8 @@ import { Event, Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ConfigurationModel, ConfigurationParseOptions, UserSettings } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationModels";
-import { IConfigurationCache } from "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration";
-import { IStoredWorkspaceFolder } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IConfigurationCache } from "@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration";
+import { IStoredWorkspaceFolder } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import { WorkbenchState, IWorkspaceFolder, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";

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

@@ -6,9 +6,9 @@ import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { FileOperationResult, FileChangeType, FileOperation, whenProviderRegistered } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { UserSettings, ConfigurationModelParser, ConfigurationModel } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationModels';
 import { StandaloneConfigurationModelParser, WorkspaceConfigurationModelParser } from '../common/configurationModels.js';
-import { APPLY_ALL_PROFILES_SETTING, TASKS_CONFIGURATION_KEY, REMOTE_MACHINE_SCOPES, WORKSPACE_SCOPES, FOLDER_SETTINGS_NAME, FOLDER_SCOPES, LAUNCH_CONFIGURATION_KEY } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { APPLICATION_SCOPES, APPLY_ALL_PROFILES_SETTING, TASKS_CONFIGURATION_KEY, REMOTE_MACHINE_SCOPES, WORKSPACE_SCOPES, FOLDER_SETTINGS_NAME, FOLDER_SCOPES, LAUNCH_CONFIGURATION_KEY } from '@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
-import { Extensions, OVERRIDE_PROPERTY_REGEX, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, OVERRIDE_PROPERTY_REGEX } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -94,7 +94,7 @@ class DefaultConfiguration extends DefaultConfiguration$1 {
 }
 class ApplicationConfiguration extends UserSettings {
     constructor(userDataProfilesService, fileService, uriIdentityService, logService) {
-        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [ConfigurationScope.APPLICATION], skipUnregistered: true }, uriIdentityService.extUri, fileService, logService);
+        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: APPLICATION_SCOPES, skipUnregistered: true }, uriIdentityService.extUri, fileService, logService);
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this._register(this.onDidChange(() => this.reloadConfigurationScheduler.schedule()));

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

@@ -5,9 +5,9 @@ import { Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspac
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ConfigurationModel } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationModels";
 import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationUpdateOverrides, IConfigurationUpdateOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
-import { IConfigurationCache, RestrictedSettings } from "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration";
+import { IConfigurationCache, RestrictedSettings } from "@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration";
 import { IWorkbenchConfigurationService } from "@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common/vscode/vs/workbench/services/configuration/common/configuration.service";
-import { IWorkspaceFolderCreationData } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IWorkspaceFolderCreationData } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";

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

@@ -14,10 +14,10 @@ import { isConfigurationOverrides, isConfigurationUpdateOverrides, Configuration
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { NullPolicyConfiguration, PolicyConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurations';
 import { Configuration } from '../common/configurationModels.js';
-import { LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES, APPLY_ALL_PROFILES_SETTING, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
+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-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { Extensions, ConfigurationScope, keyFromOverrideIdentifiers, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
-import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces';
+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 { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces';
 import { EditableConfigurationTarget, ConfigurationEditing } from '../common/configurationEditing.js';
 import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
 import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
@@ -39,9 +39,11 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { runWhenWindowIdle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 
 function getLocalUserConfigurationScopes(userDataProfile, hasRemote) {
-    return (userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings)
-        ? hasRemote ? LOCAL_MACHINE_SCOPES : undefined
-        : hasRemote ? LOCAL_MACHINE_PROFILE_SCOPES : PROFILE_SCOPES;
+    const isDefaultProfile = userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings;
+    if (isDefaultProfile) {
+        return hasRemote ? LOCAL_MACHINE_SCOPES : undefined;
+    }
+    return hasRemote ? LOCAL_MACHINE_PROFILE_SCOPES : PROFILE_SCOPES;
 }
 class Workspace extends Workspace$1 {
     constructor() {
@@ -396,7 +398,8 @@ class WorkspaceService extends Disposable {
         this.instantiationService = instantiationService;
     }
     isSettingAppliedForAllProfiles(key) {
-        if (this.configurationRegistry.getConfigurationProperties()[key]?.scope === ConfigurationScope.APPLICATION) {
+        const scope = this.configurationRegistry.getConfigurationProperties()[key]?.scope;
+        if (scope && APPLICATION_SCOPES.includes(scope)) {
             return true;
         }
         const allProfilesSettings = this.getValue(APPLY_ALL_PROFILES_SETTING) ?? [];
@@ -676,7 +679,8 @@ class WorkspaceService extends Disposable {
         const configurationProperties = this.configurationRegistry.getConfigurationProperties();
         const changedKeys = [];
         for (const changedKey of change.keys) {
-            if (configurationProperties[changedKey]?.scope === ConfigurationScope.APPLICATION) {
+            const scope = configurationProperties[changedKey]?.scope;
+            if (scope && APPLICATION_SCOPES.includes(scope)) {
                 changedKeys.push(changedKey);
                 if (changedKey === APPLY_ALL_PROFILES_SETTING) {
                     for (const previousAllProfileSetting of previousAllProfilesSettings) {
@@ -992,7 +996,7 @@ class WorkspaceService extends Disposable {
         if (target === ConfigurationTarget.USER) {
             if (this.remoteUserConfiguration) {
                 const scope = this.configurationRegistry.getConfigurationProperties()[key]?.scope;
-                if (scope === ConfigurationScope.MACHINE || scope === ConfigurationScope.MACHINE_OVERRIDABLE) {
+                if (scope === ConfigurationScope.MACHINE || scope === ConfigurationScope.MACHINE_OVERRIDABLE || scope === ConfigurationScope.APPLICATION_MACHINE) {
                     return EditableConfigurationTarget.USER_REMOTE;
                 }
                 if (this.inspect(key).userRemoteValue !== undefined) {
@@ -1054,7 +1058,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             allowComments: true
         };
         const machineSettingsSchema = {
-            properties: Object.assign({}, machineSettings.properties, machineOverridableSettings.properties, windowSettings.properties, resourceSettings.properties),
+            properties: Object.assign({}, applicationMachineSettings.properties, machineSettings.properties, machineOverridableSettings.properties, windowSettings.properties, resourceSettings.properties),
             patternProperties: allSettings.patternProperties,
             additionalProperties: true,
             allowTrailingCommas: true,
@@ -1090,7 +1094,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             } : workspaceSettingsSchema;
         const configDefaultsSchema = {
             type: 'object',
-            description: ( localize(11280, 'Contribute defaults for configurations')),
+            description: ( localize(11476, 'Contribute defaults for configurations')),
             properties: Object.assign({}, this.filterDefaultOverridableProperties(machineOverridableSettings.properties), this.filterDefaultOverridableProperties(windowSettings.properties), this.filterDefaultOverridableProperties(resourceSettings.properties)),
             patternProperties: {
                 [OVERRIDE_PROPERTY_PATTERN]: {
@@ -1211,7 +1215,7 @@ configurationRegistry.registerConfiguration({
     properties: {
         [APPLY_ALL_PROFILES_SETTING]: {
             'type': 'array',
-            description: ( localize(11281, "Configure settings to be applied for all profiles.")),
+            description: ( localize(11477, "Configure settings to be applied for all profiles.")),
             'default': [],
             'scope': ConfigurationScope.APPLICATION,
             additionalProperties: true,

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

@@ -1,4 +1,4 @@
-import { IConfigurationCache, ConfigurationKey } from "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration";
+import { IConfigurationCache, ConfigurationKey } from "@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";

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

@@ -2,13 +2,13 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { setProperty } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonEdit';
+import { setProperty } from '@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common/vscode/vs/base/common/jsonEdit';
 import { Queue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, TASKS_DEFAULT, FOLDER_SCOPES, USER_STANDALONE_CONFIGURATIONS, WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, TASKS_DEFAULT, APPLICATION_SCOPES, FOLDER_SCOPES, USER_STANDALONE_CONFIGURATIONS, WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { IWorkbenchConfigurationService } from '@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common/vscode/vs/workbench/services/configuration/common/configuration.service';
 import { FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -127,7 +127,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                 throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE, operation.target, operation);
             }
             throw ( new ConfigurationEditingError(( localize(
-                11282,
+                11478,
                 "Error while writing to {0}. {1}",
                 this.stringifyTarget(operation.target),
                 error.message
@@ -187,8 +187,8 @@ let ConfigurationEditing = class ConfigurationEditing {
         }
     }
     onInvalidConfigurationError(error, operation) {
-        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11283, "Open Tasks Configuration"))
-            : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11284, "Open Launch Configuration"))
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11479, "Open Tasks Configuration"))
+            : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11480, "Open Launch Configuration"))
                 : null;
         if (openStandAloneConfigurationActionLabel) {
             this.notificationService.prompt(Severity.Error, error.message, [{
@@ -198,18 +198,18 @@ let ConfigurationEditing = class ConfigurationEditing {
         }
         else {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                    label: ( localize(11285, "Open Settings")),
+                    label: ( localize(11481, "Open Settings")),
                     run: () => this.openSettings(operation)
                 }]);
         }
     }
     onConfigurationFileDirtyError(error, operation, scopes) {
-        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11283, "Open Tasks Configuration"))
-            : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11284, "Open Launch Configuration"))
+        const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11479, "Open Tasks Configuration"))
+            : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11480, "Open Launch Configuration"))
                 : null;
         if (openStandAloneConfigurationActionLabel) {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                    label: ( localize(11286, "Save and Retry")),
+                    label: ( localize(11482, "Save and Retry")),
                     run: () => {
                         const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
                         this.writeConfiguration(operation.target, { key, value: operation.value }, { handleDirtyFile: 'save', scopes });
@@ -222,11 +222,11 @@ let ConfigurationEditing = class ConfigurationEditing {
         }
         else {
             this.notificationService.prompt(Severity.Error, error.message, [{
-                    label: ( localize(11286, "Save and Retry")),
+                    label: ( localize(11482, "Save and Retry")),
                     run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
                 },
                 {
-                    label: ( localize(11285, "Open Settings")),
+                    label: ( localize(11481, "Open Settings")),
                     run: () => this.openSettings(operation)
                 }]);
         }
@@ -263,82 +263,82 @@ let ConfigurationEditing = class ConfigurationEditing {
     toErrorMessage(error, target, operation) {
         switch (error) {
             case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION: return localize(
-                11287,
+                11483,
                 "Unable to write {0} because it is configured in system policy.",
                 operation.key
             );
             case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY: return localize(
-                11288,
+                11484,
                 "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(
-                11289,
+                11485,
                 "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(
-                11290,
+                11486,
                 "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(
-                11291,
+                11487,
                 "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(
-                11292,
+                11488,
                 "Unable to write to User Settings because {0} does not support for global scope.",
                 operation.key
             );
             case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET: return localize(
-                11293,
+                11489,
                 "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(
-                11294,
+                11490,
                 "Unable to write to Folder Settings because no resource is provided."
             );
             case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION: return localize(
-                11295,
+                11491,
                 "Unable to write to Language Settings because {0} is not a resource language setting.",
                 operation.key
             );
             case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED: return localize(
-                11296,
+                11492,
                 "Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
                 this.stringifyTarget(target)
             );
             case ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION: {
                 if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                     return localize(
-                        11297,
+                        11493,
                         "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(
-                        11298,
+                        11494,
                         "Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
                     );
                 }
                 switch (target) {
                     case EditableConfigurationTarget.USER_LOCAL:
                         return localize(
-                            11299,
+                            11495,
                             "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(
-                            11300,
+                            11496,
                             "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(
-                            11301,
+                            11497,
                             "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: {
@@ -350,7 +350,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                             }
                         }
                         return localize(
-                            11302,
+                            11498,
                             "Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
                             workspaceFolderName
                         );
@@ -362,30 +362,30 @@ let ConfigurationEditing = class ConfigurationEditing {
             case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY: {
                 if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                     return localize(
-                        11303,
+                        11499,
                         "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(
-                        11304,
+                        11500,
                         "Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
                     );
                 }
                 switch (target) {
                     case EditableConfigurationTarget.USER_LOCAL:
                         return localize(
-                            11305,
+                            11501,
                             "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(
-                            11306,
+                            11502,
                             "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(
-                            11307,
+                            11503,
                             "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: {
@@ -397,7 +397,7 @@ let ConfigurationEditing = class ConfigurationEditing {
                             }
                         }
                         return localize(
-                            11308,
+                            11504,
                             "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
                         );
@@ -409,40 +409,40 @@ let ConfigurationEditing = class ConfigurationEditing {
             case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE:
                 if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
                     return localize(
-                        11309,
+                        11505,
                         "Unable to write into tasks configuration file because the content of the file is newer."
                     );
                 }
                 if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
                     return localize(
-                        11310,
+                        11506,
                         "Unable to write into launch configuration file because the content of the file is newer."
                     );
                 }
                 switch (target) {
                     case EditableConfigurationTarget.USER_LOCAL:
                         return localize(
-                            11311,
+                            11507,
                             "Unable to write into user settings because the content of the file is newer."
                         );
                     case EditableConfigurationTarget.USER_REMOTE:
                         return localize(
-                            11312,
+                            11508,
                             "Unable to write into remote user settings because the content of the file is newer."
                         );
                     case EditableConfigurationTarget.WORKSPACE:
                         return localize(
-                            11313,
+                            11509,
                             "Unable to write into workspace settings because the content of the file is newer."
                         );
                     case EditableConfigurationTarget.WORKSPACE_FOLDER:
                         return localize(
-                            11314,
+                            11510,
                             "Unable to write into folder settings because the content of the file is newer."
                         );
                 }
             case ConfigurationEditingErrorCode.ERROR_INTERNAL: return localize(
-                11315,
+                11511,
                 "Unable to write to {0} because of an internal error.",
                 this.stringifyTarget(target)
             );
@@ -451,13 +451,13 @@ let ConfigurationEditing = class ConfigurationEditing {
     stringifyTarget(target) {
         switch (target) {
             case EditableConfigurationTarget.USER_LOCAL:
-                return localize(11316, "User Settings");
+                return localize(11512, "User Settings");
             case EditableConfigurationTarget.USER_REMOTE:
-                return localize(11317, "Remote User Settings");
+                return localize(11513, "Remote User Settings");
             case EditableConfigurationTarget.WORKSPACE:
-                return localize(11318, "Workspace Settings");
+                return localize(11514, "Workspace Settings");
             case EditableConfigurationTarget.WORKSPACE_FOLDER:
-                return localize(11319, "Folder Settings");
+                return localize(11515, "Folder Settings");
             default:
                 return '';
         }
@@ -507,7 +507,7 @@ let ConfigurationEditing = class ConfigurationEditing {
         }
         if (target === EditableConfigurationTarget.WORKSPACE) {
             if (!operation.workspaceStandAloneConfigurationKey && !OVERRIDE_PROPERTY_REGEX.test(operation.key)) {
-                if (configurationScope === ConfigurationScope.APPLICATION) {
+                if (configurationScope && APPLICATION_SCOPES.includes(configurationScope)) {
                     throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION, target, operation);
                 }
                 if (configurationScope === ConfigurationScope.MACHINE) {

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

@@ -1,6 +1,6 @@
 import { IConfigurationModel, IConfigurationOverrides, IConfigurationValue, IConfigurationChange } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
 import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationModel, ConfigurationParseOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationModels";
-import { IStoredWorkspaceFolder } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IStoredWorkspaceFolder } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import { Workspace } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { ResourceMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";

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

@@ -86,6 +86,17 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 }
                 return undefined;
             },
+            getColumnNumber: () => {
+                const activeTextEditorControl = editorService.activeTextEditorControl;
+                if (isCodeEditor(activeTextEditorControl)) {
+                    const selection = activeTextEditorControl.getSelection();
+                    if (selection) {
+                        const columnNumber = selection.positionColumn;
+                        return String(columnNumber);
+                    }
+                }
+                return undefined;
+            },
             getExtension: id => {
                 return extensionService.getExtension(id);
             },
@@ -174,7 +185,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                     result = await this.commandService.executeCommand(commandId, configuration);
                     if (typeof result !== 'string' && !isUndefinedOrNull(result)) {
                         throw ( new Error(( localize(
-                            11321,
+                            11517,
                             "Cannot substitute command variable '{0}' because command did not return a result of type string.",
                             commandId
                         ))));
@@ -226,7 +237,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
     showUserInput(section, variable, inputInfos) {
         if (!inputInfos) {
             return Promise.reject(( new Error(( localize(
-                11322,
+                11518,
                 "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
                 variable,
                 'inputs'
@@ -236,7 +247,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
         if (info) {
             const missingAttribute = (attrName) => {
                 throw ( new Error(( localize(
-                    11323,
+                    11519,
                     "Input variable '{0}' is of type '{1}' and must include '{2}'.",
                     variable,
                     info.type,
@@ -288,7 +299,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             value: value
                         };
                         if (value === info.default) {
-                            item.description = ( localize(11324, "(Default)"));
+                            item.description = ( localize(11520, "(Default)"));
                             picks.unshift(item);
                         }
                         else if (!info.default && value === previousPickedValue) {
@@ -317,7 +328,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             return result;
                         }
                         throw ( new Error(( localize(
-                            11325,
+                            11521,
                             "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
                             variable,
                             info.command
@@ -326,14 +337,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 }
                 default:
                     throw ( new Error(( localize(
-                        11326,
+                        11522,
                         "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
                         variable
                     ))));
             }
         }
         return Promise.reject(( new Error(( localize(
-            11327,
+            11523,
             "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
             variable
         )))));

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

@@ -2,7 +2,7 @@ import { IWorkspaceEditingService } from "@codingame/monaco-vscode-api/vscode/vs
 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 { IJSONEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
-import { IWorkspaceFolderCreationData, IEnterWorkspaceResult } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IWorkspaceFolderCreationData, IEnterWorkspaceResult } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import { IWorkspacesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service";
 import { WorkspaceService } from "../../configuration/browser/configurationService.js";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";

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

@@ -5,7 +5,7 @@ import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSav
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { JSONEditingErrorCode } from '@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing';
 import { IJSONEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
-import { rewriteWorkspaceFileForNewLocation } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces';
+import { rewriteWorkspaceFileForNewLocation } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces';
 import { IWorkspacesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service';
 import { ConfigurationScope, Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
@@ -56,8 +56,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             availableFileSystems.unshift(Schemas.vscodeRemote);
         }
         let workspacePath = await this.fileDialogService.showSaveDialog({
-            saveLabel: mnemonicButtonLabel(( localize(12131, "Save"))),
-            title: ( localize(12132, "Save Workspace")),
+            saveLabel: mnemonicButtonLabel(( localize(12353, "Save"))),
+            title: ( localize(12354, "Save Workspace")),
             filters: WORKSPACE_FILTER,
             defaultUri: joinPath(await this.fileDialogService.defaultWorkspacePath(), this.getNewWorkspaceName()),
             availableFileSystems
@@ -256,14 +256,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     onInvalidWorkspaceConfigurationFileError() {
         const message = ( localize(
-            12133,
+            12355,
             "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(12134, "Open Workspace Configuration")),
+                label: ( localize(12356, "Open Workspace Configuration")),
                 run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
             }]);
     }

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

@@ -1,4 +1,4 @@
-import { IWorkspaceFolderCreationData, IEnterWorkspaceResult, IRecentlyOpened, IRecent } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import { IWorkspaceFolderCreationData, IEnterWorkspaceResult, IRecentlyOpened, IRecent } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces";
 import { IWorkspacesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspaces/common/workspaces.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -9,7 +9,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
-import { IWorkspaceBackupInfo, IFolderBackupInfo } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/backup/common/backup";
+import { IWorkspaceBackupInfo, IFolderBackupInfo } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/backup/common/backup";
 export declare class BrowserWorkspacesService extends Disposable implements IWorkspacesService {
     private readonly storageService;
     private readonly contextService;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { restoreRecentlyOpened, isRecentFolder, isRecentWorkspace, isRecentFile, toStoreData, getStoredWorkspaceFolder } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces';
+import { restoreRecentlyOpened, isRecentFolder, isRecentWorkspace, isRecentFile, toStoreData, getStoredWorkspaceFolder } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspaces/common/workspaces';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';