@codingame/monaco-vscode-api 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js

@@ -28,30 +28,30 @@ const colorIdPattern = "^\\w+[.\\w+]*$";
 const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "colors",
     jsonSchema: {
-        description: ( localize(16044, "Contributes extension defined themable colors")),
+        description: ( localize(16342, "Contributes extension defined themable colors")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
                     type: "string",
-                    description: ( localize(16045, "The identifier of the themable color")),
+                    description: ( localize(16343, "The identifier of the themable color")),
                     pattern: colorIdPattern,
                     patternErrorMessage: ( localize(
-                        16046,
+                        16344,
                         "Identifiers must only contain letters, digits and dots and can not start with a dot"
                     ))
                 },
                 description: {
                     type: "string",
-                    description: ( localize(16047, "The description of the themable color"))
+                    description: ( localize(16345, "The description of the themable color"))
                 },
                 defaults: {
                     type: "object",
                     properties: {
                         light: {
                             description: ( localize(
-                                16048,
+                                16346,
                                 "The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default."
                             )),
                             type: "string",
@@ -62,7 +62,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         dark: {
                             description: ( localize(
-                                16049,
+                                16347,
                                 "The default color for dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default."
                             )),
                             type: "string",
@@ -73,7 +73,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrast: {
                             description: ( localize(
-                                16050,
+                                16348,
                                 "The default color for high contrast dark themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `dark` color is used as default for high contrast dark themes."
                             )),
                             type: "string",
@@ -84,7 +84,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         },
                         highContrastLight: {
                             description: ( localize(
-                                16051,
+                                16349,
                                 "The default color for high contrast light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default. If not provided, the `light` color is used as default for high contrast light themes."
                             )),
                             type: "string",
@@ -107,7 +107,7 @@ class ColorExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(16052, "'configuration.colors' must be a array")));
+                    collector.error(( localize(16350, "'configuration.colors' must be a array")));
                     return;
                 }
                 const parseColorValue = (s, name) => {
@@ -119,7 +119,7 @@ class ColorExtensionPoint {
                         }
                     }
                     collector.error(( localize(
-                        16053,
+                        16351,
                         "{0} must be either a color value in hex (#RRGGBB[AA] or #RGB[A]) or the identifier of a themable color which provides the default.",
                         name
                     )));
@@ -127,19 +127,19 @@ class ColorExtensionPoint {
                 };
                 for (const colorContribution of extensionValue) {
                     if (typeof colorContribution.id !== "string" || colorContribution.id.length === 0) {
-                        collector.error(( localize(16054, "'configuration.colors.id' must be defined and can not be empty")));
+                        collector.error(( localize(16352, "'configuration.colors.id' must be defined and can not be empty")));
                         return;
                     }
                     if (!colorContribution.id.match(colorIdPattern)) {
                         collector.error(( localize(
-                            16055,
+                            16353,
                             "'configuration.colors.id' must only contain letters, digits and dots and can not start with a dot"
                         )));
                         return;
                     }
                     if (typeof colorContribution.description !== "string" || colorContribution.id.length === 0) {
                         collector.error(( localize(
-                            16056,
+                            16354,
                             "'configuration.colors.description' must be defined and can not be empty"
                         )));
                         return;
@@ -147,21 +147,21 @@ class ColorExtensionPoint {
                     const defaults = colorContribution.defaults;
                     if (!defaults || typeof defaults !== "object" || typeof defaults.light !== "string" || typeof defaults.dark !== "string") {
                         collector.error(( localize(
-                            16057,
+                            16355,
                             "'configuration.colors.defaults' must be defined and must contain 'light' and 'dark'"
                         )));
                         return;
                     }
                     if (defaults.highContrast && typeof defaults.highContrast !== "string") {
                         collector.error(( localize(
-                            16058,
+                            16356,
                             "If defined, 'configuration.colors.defaults.highContrast' must be a string."
                         )));
                         return;
                     }
                     if (defaults.highContrastLight && typeof defaults.highContrastLight !== "string") {
                         collector.error(( localize(
-                            16059,
+                            16357,
                             "If defined, 'configuration.colors.defaults.highContrastLight' must be a string."
                         )));
                         return;
@@ -208,7 +208,7 @@ class ColorDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(16060, "ID")), ( localize(16061, "Description")), ( localize(16062, "Dark Default")), ( localize(16063, "Light Default")), ( localize(16064, "High Contrast Default"))];
+        const headers = [( localize(16358, "ID")), ( localize(16359, "Description")), ( localize(16360, "Dark Default")), ( localize(16361, "Light Default")), ( localize(16362, "High Contrast Default"))];
         const toColor = colorReference => colorReference[0] === "#" ? ( Color.fromHex(colorReference)) : undefined;
         const rows = ( colors.sort((a, b) => a.id.localeCompare(b.id)).map(color => {
             return [( new MarkdownString()).appendMarkdown(`\`${color.id}\``), color.description, toColor(color.defaults.dark) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.dark}\``), toColor(color.defaults.light) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.light}\``), toColor(color.defaults.highContrast) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.highContrast}\``)];
@@ -224,7 +224,7 @@ class ColorDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "colors",
-    label: ( localize(16065, "Colors")),
+    label: ( localize(16363, "Colors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js

@@ -666,12 +666,12 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         const contentValue = parse(content, errors);
         if (errors.length > 0) {
             return Promise.reject(( new Error(( localize(
-                16066,
+                16364,
                 "Problems parsing JSON theme file: {0}",
                 ( errors.map(e => getParseErrorMessage(e.error))).join(", ")
             )))));
         } else if (getNodeType(contentValue) !== "object") {
-            return Promise.reject(( new Error(( localize(16067, "Invalid format for JSON theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(16365, "Invalid format for JSON theme file: Object expected.")))));
         }
         if (contentValue.include) {
             await _loadColorTheme(
@@ -689,7 +689,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
         if (colors) {
             if (typeof colors !== "object") {
                 return Promise.reject(( new Error(( localize(
-                    16068,
+                    16366,
                     "Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.",
                     (themeLocation.toString())
                 )))));
@@ -715,7 +715,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                 );
             } else {
                 return Promise.reject(( new Error(( localize(
-                    16069,
+                    16367,
                     "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file",
                     (themeLocation.toString())
                 )))));
@@ -731,7 +731,7 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                     }
                 } catch (e) {
                     return Promise.reject(( new Error(( localize(
-                        16070,
+                        16368,
                         "Problem parsing color theme file: {0}. Property 'semanticTokenColors' contains a invalid selector",
                         (themeLocation.toString())
                     )))));
@@ -748,16 +748,16 @@ function _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result
             const contentValue = parse$1(content);
             const settings = contentValue.settings;
             if (!Array.isArray(settings)) {
-                return Promise.reject(( new Error(( localize(16071, "Problem parsing tmTheme file: {0}. 'settings' is not array.")))));
+                return Promise.reject(( new Error(( localize(16369, "Problem parsing tmTheme file: {0}. 'settings' is not array.")))));
             }
             convertSettings(settings, result);
             return Promise.resolve(null);
         } catch (e) {
-            return Promise.reject(( new Error(( localize(16072, "Problems parsing tmTheme file: {0}", e.message)))));
+            return Promise.reject(( new Error(( localize(16370, "Problems parsing tmTheme file: {0}", e.message)))));
         }
     }, error => {
         return Promise.reject(( new Error(( localize(
-            16073,
+            16371,
             "Problems loading tmTheme file {0}: {1}",
             (themeLocation.toString()),
             error.message

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -16,13 +16,13 @@ const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegmen
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "icons",
     jsonSchema: {
-        description: ( localize(16127, "Contributes extension defined themable icons")),
+        description: ( localize(16425, "Contributes extension defined themable icons")),
         type: "object",
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localize(16128, "The identifier of the themable icon")),
+            description: ( localize(16426, "The identifier of the themable icon")),
             patternErrorMessage: ( localize(
-                16129,
+                16427,
                 "Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`."
             ))
         },
@@ -31,18 +31,18 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: "string",
-                    description: ( localize(16130, "The description of the themable icon"))
+                    description: ( localize(16428, "The description of the themable icon"))
                 },
                 default: {
                     anyOf: [iconReferenceSchema, {
                         type: "object",
                         properties: {
                             fontPath: {
-                                description: ( localize(16131, "The path of the icon font that defines the icon.")),
+                                description: ( localize(16429, "The path of the icon font that defines the icon.")),
                                 type: "string"
                             },
                             fontCharacter: {
-                                description: ( localize(16132, "The character for the icon in the icon font.")),
+                                description: ( localize(16430, "The character for the icon in the icon font.")),
                                 type: "string"
                             }
                         },
@@ -55,7 +55,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                         }]
                     }],
                     description: ( localize(
-                        16133,
+                        16431,
                         "The default of the icon. Either a reference to an existing ThemeIcon or an icon in an icon font."
                     ))
                 }
@@ -92,7 +92,7 @@ class IconExtensionPoint {
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== "object") {
                     collector.error(( localize(
-                        16134,
+                        16432,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
@@ -100,7 +100,7 @@ class IconExtensionPoint {
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
                         collector.error(( localize(
-                            16135,
+                            16433,
                             "'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. They need to consist of at least two segments in the form `component-iconname`."
                         )));
                         return;
@@ -108,7 +108,7 @@ class IconExtensionPoint {
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== "string" || iconContribution.description.length === 0) {
                         collector.error(( localize(
-                            16136,
+                            16434,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -123,7 +123,7 @@ class IconExtensionPoint {
                         const format = formatMap[fileExt];
                         if (!format) {
                             collector.warn(( localize(
-                                16137,
+                                16435,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -140,7 +140,7 @@ class IconExtensionPoint {
                         });
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
                             collector.warn(( localize(
-                                16138,
+                                16436,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -156,7 +156,7 @@ class IconExtensionPoint {
                         }, iconContribution.description);
                     } else {
                         collector.error(( localize(
-                            16139,
+                            16437,
                             "'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with properties `fontPath` and `fontCharacter`."
                         )));
                     }

package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js

@@ -10,26 +10,26 @@ const tokenClassificationRegistry = getTokenClassificationRegistry();
 const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenTypes",
     jsonSchema: {
-        description: ( localize(16200, "Contributes semantic token types.")),
+        description: ( localize(16498, "Contributes semantic token types.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
                     type: "string",
-                    description: ( localize(16201, "The identifier of the semantic token type")),
+                    description: ( localize(16499, "The identifier of the semantic token type")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(16202, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16500, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 superType: {
                     type: "string",
-                    description: ( localize(16203, "The super type of the semantic token type")),
+                    description: ( localize(16501, "The super type of the semantic token type")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(16204, "Super types should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16502, "Super types should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 description: {
                     type: "string",
-                    description: ( localize(16205, "The description of the semantic token type"))
+                    description: ( localize(16503, "The description of the semantic token type"))
                 }
             }
         }
@@ -38,20 +38,20 @@ const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
 const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenModifiers",
     jsonSchema: {
-        description: ( localize(16206, "Contributes semantic token modifiers.")),
+        description: ( localize(16504, "Contributes semantic token modifiers.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
                     type: "string",
-                    description: ( localize(16207, "The identifier of the semantic token modifier")),
+                    description: ( localize(16505, "The identifier of the semantic token modifier")),
                     pattern: typeAndModifierIdPattern,
-                    patternErrorMessage: ( localize(16208, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
+                    patternErrorMessage: ( localize(16506, "Identifiers should be in the form letterOrDigit[_-letterOrDigit]*"))
                 },
                 description: {
                     type: "string",
-                    description: ( localize(16209, "The description of the semantic token modifier"))
+                    description: ( localize(16507, "The description of the semantic token modifier"))
                 }
             }
         }
@@ -60,18 +60,18 @@ const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
 const tokenStyleDefaultsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "semanticTokenScopes",
     jsonSchema: {
-        description: ( localize(16210, "Contributes semantic token scope maps.")),
+        description: ( localize(16508, "Contributes semantic token scope maps.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 language: {
-                    description: ( localize(16211, "Lists the languge for which the defaults are.")),
+                    description: ( localize(16509, "Lists the languge for which the defaults are.")),
                     type: "string"
                 },
                 scopes: {
                     description: ( localize(
-                        16212,
+                        16510,
                         "Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token."
                     )),
                     type: "object",
@@ -91,7 +91,7 @@ class TokenClassificationExtensionPoints {
         function validateTypeOrModifier(contribution, extensionPoint, collector) {
             if (typeof contribution.id !== "string" || contribution.id.length === 0) {
                 collector.error(( localize(
-                    16213,
+                    16511,
                     "'configuration.{0}.id' must be defined and can not be empty",
                     extensionPoint
                 )));
@@ -99,7 +99,7 @@ class TokenClassificationExtensionPoints {
             }
             if (!contribution.id.match(typeAndModifierIdPattern)) {
                 collector.error(( localize(
-                    16214,
+                    16512,
                     "'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*",
                     extensionPoint
                 )));
@@ -108,7 +108,7 @@ class TokenClassificationExtensionPoints {
             const superType = contribution.superType;
             if (superType && !superType.match(typeAndModifierIdPattern)) {
                 collector.error(( localize(
-                    16215,
+                    16513,
                     "'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*",
                     extensionPoint
                 )));
@@ -116,7 +116,7 @@ class TokenClassificationExtensionPoints {
             }
             if (typeof contribution.description !== "string" || contribution.id.length === 0) {
                 collector.error(( localize(
-                    16216,
+                    16514,
                     "'configuration.{0}.description' must be defined and can not be empty",
                     extensionPoint
                 )));
@@ -129,7 +129,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(16217, "'configuration.semanticTokenType' must be an array")));
+                    collector.error(( localize(16515, "'configuration.semanticTokenType' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -150,7 +150,7 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(16218, "'configuration.semanticTokenModifier' must be an array")));
+                    collector.error(( localize(16516, "'configuration.semanticTokenModifier' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
@@ -171,17 +171,17 @@ class TokenClassificationExtensionPoints {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(16219, "'configuration.semanticTokenScopes' must be an array")));
+                    collector.error(( localize(16517, "'configuration.semanticTokenScopes' must be an array")));
                     return;
                 }
                 for (const contribution of extensionValue) {
                     if (contribution.language && typeof contribution.language !== "string") {
-                        collector.error(( localize(16220, "'configuration.semanticTokenScopes.language' must be a string")));
+                        collector.error(( localize(16518, "'configuration.semanticTokenScopes.language' must be a string")));
                         continue;
                     }
                     if (!contribution.scopes || typeof contribution.scopes !== "object") {
                         collector.error(( localize(
-                            16221,
+                            16519,
                             "'configuration.semanticTokenScopes.scopes' must be defined as an object"
                         )));
                         continue;
@@ -190,7 +190,7 @@ class TokenClassificationExtensionPoints {
                         const tmScopes = contribution.scopes[selectorString];
                         if (!Array.isArray(tmScopes) || ( tmScopes.some(l => typeof l !== "string"))) {
                             collector.error(( localize(
-                                16222,
+                                16520,
                                 "'configuration.semanticTokenScopes.scopes' values must be an array of strings"
                             )));
                             continue;
@@ -202,7 +202,7 @@ class TokenClassificationExtensionPoints {
                             });
                         } catch (e) {
                             collector.error(( localize(
-                                16223,
+                                16521,
                                 "configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.",
                                 selectorString
                             )));

package/vscode/src/vs/workbench/services/themes/common/workbenchThemeService.d.ts

@@ -23,15 +23,19 @@ export declare enum ThemeSettings {
     SYSTEM_COLOR_THEME = "window.systemColorTheme"
 }
 export declare namespace ThemeSettingDefaults {
-    const COLOR_THEME_DARK: string;
-    const COLOR_THEME_LIGHT: string;
+    const COLOR_THEME_DARK = "VS Code Dark";
+    const COLOR_THEME_LIGHT = "VS Code Light";
     const COLOR_THEME_HC_DARK = "Default High Contrast";
     const COLOR_THEME_HC_LIGHT = "Default High Contrast Light";
-    const COLOR_THEME_DARK_OLD = "Default Dark+";
-    const COLOR_THEME_LIGHT_OLD = "Default Light+";
     const FILE_ICON_THEME = "vs-seti";
     const PRODUCT_ICON_THEME = "Default";
 }
+/**
+ * Migrates legacy theme settings IDs to their current equivalents.
+ * Theme IDs were simplified: "Default" prefix was removed from built-in themes,
+ * and "Experimental" prefix was replaced when VS Code themes became GA.
+ */
+export declare function migrateThemeSettingsId(settingsId: string): string;
 export declare const COLOR_THEME_DARK_INITIAL_COLORS: {
     "actionBar.toggledBackground": string;
     "activityBar.activeBorder": string;

package/vscode/src/vs/workbench/services/themes/common/workbenchThemeService.js

@@ -1,6 +1,5 @@
 
 import { isString, isBoolean } from '../../../../base/common/types.js';
-import product from '../../../../platform/product/common/product.js';
 
 const THEME_SCOPE_OPEN_PAREN = '[';
 const THEME_SCOPE_CLOSE_PAREN = ']';
@@ -22,18 +21,26 @@ var ThemeSettings;
     ThemeSettings["DETECT_HC"] = "window.autoDetectHighContrast";
     ThemeSettings["SYSTEM_COLOR_THEME"] = "window.systemColorTheme";
 })(ThemeSettings || (ThemeSettings = {}));
-const isOSS = !product.quality;
 var ThemeSettingDefaults;
 (function (ThemeSettingDefaults) {
-    ThemeSettingDefaults.COLOR_THEME_DARK = isOSS ? 'Experimental Dark' : 'Default Dark Modern';
-    ThemeSettingDefaults.COLOR_THEME_LIGHT = isOSS ? 'Experimental Light' : 'Default Light Modern';
+    ThemeSettingDefaults.COLOR_THEME_DARK = 'VS Code Dark';
+    ThemeSettingDefaults.COLOR_THEME_LIGHT = 'VS Code Light';
     ThemeSettingDefaults.COLOR_THEME_HC_DARK = 'Default High Contrast';
     ThemeSettingDefaults.COLOR_THEME_HC_LIGHT = 'Default High Contrast Light';
-    ThemeSettingDefaults.COLOR_THEME_DARK_OLD = 'Default Dark+';
-    ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD = 'Default Light+';
     ThemeSettingDefaults.FILE_ICON_THEME = 'vs-seti';
     ThemeSettingDefaults.PRODUCT_ICON_THEME = 'Default';
 })(ThemeSettingDefaults || (ThemeSettingDefaults = {}));
+function migrateThemeSettingsId(settingsId) {
+    switch (settingsId) {
+        case 'Default Dark Modern': return 'Dark Modern';
+        case 'Default Light Modern': return 'Light Modern';
+        case 'Default Dark+': return 'Dark+';
+        case 'Default Light+': return 'Light+';
+        case 'Experimental Dark': return 'VS Code Dark';
+        case 'Experimental Light': return 'VS Code Light';
+    }
+    return settingsId;
+}
 const COLOR_THEME_DARK_INITIAL_COLORS = {
     'actionBar.toggledBackground': '#383a49',
     'activityBar.activeBorder': '#0078D4',
@@ -345,4 +352,4 @@ var ExtensionData;
     ExtensionData.fromName = fromName;
 })(ExtensionData || (ExtensionData = {}));
 
-export { COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS, ExtensionData, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, THEME_SCOPE_WILDCARD, ThemeSettingDefaults, ThemeSettings, themeScopeRegex };
+export { COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS, ExtensionData, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, THEME_SCOPE_WILDCARD, ThemeSettingDefaults, ThemeSettings, migrateThemeSettingsId, themeScopeRegex };

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js

@@ -18,14 +18,14 @@ const PROFILE_URL_AUTHORITY_PREFIX = "profile-";
 function isProfileURL(uri) {
     return uri.authority === PROFILE_URL_AUTHORITY || ( new RegExp(`^${PROFILE_URL_AUTHORITY_PREFIX}`)).test(uri.authority);
 }
-const defaultUserDataProfileIcon = registerIcon("defaultProfile-icon", Codicon.settings, ( localize(16278, "Icon for Default Profile.")));
-const PROFILES_TITLE = ( localize2(16279, "Profiles"));
+const defaultUserDataProfileIcon = registerIcon("defaultProfile-icon", Codicon.settings, ( localize(16576, "Icon for Default Profile.")));
+const PROFILES_TITLE = ( localize2(16577, "Profiles"));
 const PROFILES_CATEGORY = {
     ...PROFILES_TITLE
 };
 const PROFILE_EXTENSION = "code-profile";
 const PROFILE_FILTER = [{
-    name: ( localize(16280, "Profile")),
+    name: ( localize(16578, "Profile")),
     extensions: [PROFILE_EXTENSION]
 }];
 const CURRENT_PROFILE_CONTEXT = ( new RawContextKey("currentProfile", ""));

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js

@@ -3,7 +3,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const DEFAULT_ICON = registerIcon("settings-view-bar-icon", Codicon.settingsGear, ( localize(16281, "Settings icon in the view bar.")));
+const DEFAULT_ICON = registerIcon("settings-view-bar-icon", Codicon.settingsGear, ( localize(16579, "Settings icon in the view bar.")));
 const ICONS = [
 DEFAULT_ICON,
 Codicon.vm, Codicon.server, Codicon.recordKeys, Codicon.deviceMobile, Codicon.watch, Codicon.vr, Codicon.piano,

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -9,25 +9,25 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 function getSyncAreaLabel(source) {
     switch (source) {
     case SyncResource.Settings:
-        return localize(16311, "Settings");
+        return localize(16609, "Settings");
     case SyncResource.Keybindings:
-        return localize(16312, "Keyboard Shortcuts");
+        return localize(16610, "Keyboard Shortcuts");
     case SyncResource.Snippets:
-        return localize(16313, "Snippets");
+        return localize(16611, "Snippets");
     case SyncResource.Prompts:
-        return localize(16314, "Prompts and Instructions");
+        return localize(16612, "Prompts and Instructions");
     case SyncResource.Tasks:
-        return localize(16315, "Tasks");
+        return localize(16613, "Tasks");
     case SyncResource.Mcp:
-        return localize(16316, "MCP Servers");
+        return localize(16614, "MCP Servers");
     case SyncResource.Extensions:
-        return localize(16317, "Extensions");
+        return localize(16615, "Extensions");
     case SyncResource.GlobalState:
-        return localize(16318, "UI State");
+        return localize(16616, "UI State");
     case SyncResource.Profiles:
-        return localize(16319, "Profiles");
+        return localize(16617, "Profiles");
     case SyncResource.WorkspaceState:
-        return localize(16320, "Workspace State");
+        return localize(16618, "Workspace State");
     }
 }
 var AccountStatus;
@@ -36,8 +36,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}));
-const SYNC_TITLE = ( localize2(16321, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(16322, "View icon of the Settings Sync view.")));
+const SYNC_TITLE = ( localize2(16619, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon("settings-sync-view-icon", Codicon.sync, ( localize(16620, "View icon of the Settings Sync view.")));
 const CONTEXT_SYNC_STATE = ( new RawContextKey("syncStatus", SyncStatus.Uninitialized));
 const CONTEXT_SYNC_ENABLEMENT = ( new RawContextKey("syncEnabled", false));
 const CONTEXT_ACCOUNT_STATE = ( new RawContextKey("userDataSyncAccountStatus", AccountStatus.Uninitialized));
@@ -50,7 +50,7 @@ const SYNC_VIEW_CONTAINER_ID = "workbench.view.sync";
 const SYNC_CONFLICTS_VIEW_ID = "workbench.views.sync.conflicts";
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: "workbench.userDataSync.actions.downloadSyncActivity",
-    title: ( localize2(16323, "Download Settings Sync Activity")),
+    title: ( localize2(16621, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)), ( CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))))