@codingame/monaco-vscode-theme-service-override 10.1.4 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "10.1.4",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4",
-    "@codingame/monaco-vscode-files-service-override": "10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
+    "@codingame/monaco-vscode-files-service-override": "11.0.0"
   }
 }

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

@@ -57,7 +57,7 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var DefaultThemeUpdatedNotificationContribution_1;
-const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(3068, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(2539, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
 var ConfigureItem;
 ( ((function(ConfigureItem) {
     ConfigureItem["BROWSE_GALLERY"] = "marketplace";
@@ -165,7 +165,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
             quickpick.matchOnDescription = true;
             quickpick.buttons = [this.quickInputService.backButton];
             quickpick.title = 'Marketplace Themes';
-            quickpick.placeholder = ( localize(3069, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(2540, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
             quickpick.canSelectMany = false;
             disposables.add(quickpick.onDidChangeValue(() => this.trigger(quickpick.value)));
             disposables.add(quickpick.onDidAccept(async (_) => {
@@ -214,10 +214,10 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
             disposables.add(this.onDidChange(() => {
                 let items = this.themes;
                 if (this._searchOngoing) {
-                    items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
+                    items = items.concat({ label: '$(loading~spin) Searching for themes...', id: undefined, alwaysShow: true });
                 }
                 else if (items.length === 0 && this._searchError) {
-                    items = [{ label: `$(error) ${( localize(3070, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                    items = [{ label: `$(error) ${( localize(2541, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
                 }
                 const activeItemId = quickpick.activeItems[0]?.id;
                 const newActiveItem = activeItemId ? items.find(i => isItem(i) && i.id === activeItemId) : undefined;
@@ -236,12 +236,12 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
         const result = await this.dialogService.confirm({
             message: ( localize(
-                3071,
+                2542,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(3072, "OK"))
+            primaryButton: ( localize(2543, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -249,7 +249,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: 15 ,
-                title: ( localize(3073, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(2544, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -396,7 +396,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(3074, 'Color Theme')),
+            title: ( localize2(2545, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -407,12 +407,12 @@ registerAction2(class extends Action2 {
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            case ColorScheme.DARK: return ( localize(3075, "Select Color Theme for System Dark Mode"));
-            case ColorScheme.LIGHT: return ( localize(3076, "Select Color Theme for System Light Mode"));
-            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(3077, "Select Color Theme for High Contrast Dark Mode"));
-            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(3078, "Select Color Theme for High Contrast Light Mode"));
+            case ColorScheme.DARK: return ( localize(2546, "Select Color Theme for System Dark Mode"));
+            case ColorScheme.LIGHT: return ( localize(2547, "Select Color Theme for System Light Mode"));
+            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(2548, "Select Color Theme for High Contrast Dark Mode"));
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(2549, "Select Color Theme for High Contrast Light Mode"));
             default:
-                return ( localize(3079, "Select Color Theme (detect system color mode disabled)"));
+                return ( localize(2550, "Select Color Theme (detect system color mode disabled)"));
         }
     }
     async run(accessor) {
@@ -422,7 +422,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3080, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(2551, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -430,15 +430,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3081, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(2552, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             })));
         }
         const options = {
-            installMessage: ( localize(3082, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3083, "Browse Additional Color Themes...")),
+            installMessage: ( localize(2553, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(2554, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -453,9 +453,9 @@ registerAction2(class extends Action2 {
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const themes = await themeService.getColorThemes();
         const currentTheme = themeService.getColorTheme();
-        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(3084, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(3085, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(3086, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(2555, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(2556, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(2557, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -478,7 +478,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(3087, 'File Icon Theme')),
+            title: ( localize2(2558, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -486,8 +486,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3088, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(3089, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(2559, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(2560, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -495,8 +495,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3090, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(3091, 'None')), description: ( localize(3092, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(2561, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(2562, 'None')), description: ( localize(2563, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -507,7 +507,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(3093, 'Product Icon Theme')),
+            title: ( localize2(2564, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -515,9 +515,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3094, "Install Additional Product Icon Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3095, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(3096, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(2565, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(2566, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(2567, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -525,8 +525,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3097, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(3098, 'Default')) },
+            { type: 'separator', label: ( localize(2568, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(2569, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -584,13 +584,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(3099, "Manage Extension")),
+    tooltip: ( localize(2570, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(3100, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(2571, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -640,7 +640,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(3101, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(2572, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -652,13 +652,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                3102,
+                2573,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity$1.Info, message, [
                 {
-                    label: ( localize(3103, "Open Settings")),
+                    label: ( localize(2574, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -696,7 +696,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(3104, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(2575, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -732,13 +732,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( (new MenuId('ThemesSubMenu')));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(3105, "Themes")),
+    title: ( localize(2576, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(3106, "&&Theme")),
+    title: ( localize(2577, "&&Theme")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -746,21 +746,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(3074, 'Color Theme'))
+        title: ( localize(2545, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(3107, "File Icon Theme"))
+        title: ( localize(2578, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(3108, "Product Icon Theme"))
+        title: ( localize(2579, "Product Icon Theme"))
     },
     order: 3
 });
@@ -802,20 +802,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         if (newTheme) {
             const choices = [
                 {
-                    label: ( localize(3109, "Keep New Theme")),
+                    label: ( localize(2580, "Keep New Theme")),
                     run: () => {
                         this._writeTelemetry('keepNew');
                     }
                 },
                 {
-                    label: ( localize(3110, "Browse Themes")),
+                    label: ( localize(2581, "Browse Themes")),
                     run: () => {
                         this._writeTelemetry('browse');
                         this._commandService.executeCommand(SelectColorThemeCommandId);
                     }
                 },
                 {
-                    label: ( localize(3111, "Revert")),
+                    label: ( localize(2582, "Revert")),
                     run: async () => {
                         this._writeTelemetry('keepOld');
                         const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD;
@@ -827,7 +827,7 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
                 }
             ];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3112,
+                2583,
                 "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.",
                 newTheme.label
             )), choices, {
@@ -840,20 +840,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         const theme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
         if (theme) {
             const choices = [{
-                    label: ( localize(3113, "Try New Theme")),
+                    label: ( localize(2584, "Try New Theme")),
                     run: () => {
                         this._writeTelemetry('tryNew');
                         this._workbenchThemeService.setColorTheme(theme, 'auto');
                     }
                 },
                 {
-                    label: ( localize(3114, "Cancel")),
+                    label: ( localize(2585, "Cancel")),
                     run: () => {
                         this._writeTelemetry('cancel');
                     }
                 }];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3115,
+                2586,
                 "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?",
                 theme.label
             )), choices, { onCancel: () => this._writeTelemetry('cancel') });

package/vscode/src/vs/workbench/services/themes/browser/fileIconThemeData.js

@@ -4,7 +4,7 @@ import { dirname, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { parse, getNodeType } from 'vscode/vscode/vs/base/common/json';
 import { ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';
-import { asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
+import { asCSSUrl } from 'vscode/vscode/vs/base/browser/cssValue';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 class FileIconThemeData {
@@ -138,13 +138,13 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( (new Error(( localize(
-                    7000,
+                    6768,
                     "Problems parsing file icons file: {0}",
                     ( (errors.map(e => getParseErrorMessage(e.error)))).join(', ')
                 ))))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( (new Error(( localize(7001, "Invalid format for file icons theme file: Object expected."))))));
+                return Promise.reject(( (new Error(( localize(6769, "Invalid format for file icons theme file: Object expected."))))));
             }
             return Promise.resolve(contentValue);
         });
@@ -297,12 +297,13 @@ class FileIconThemeLoader {
         const fonts = iconThemeDocument.fonts;
         const fontSizes = ( (new Map()));
         if (Array.isArray(fonts)) {
-            const defaultFontSize = fonts[0].size || '150%';
+            const defaultFontSize = this.tryNormalizeFontSize(fonts[0].size) || '150%';
             fonts.forEach(font => {
                 const src = ( (font.src.map(l => `${asCSSUrl(resolvePath(l.path))} format('${l.format}')`))).join(', ');
                 cssRules.push(`@font-face { src: ${src}; font-family: '${font.id}'; font-weight: ${font.weight}; font-style: ${font.style}; font-display: block; }`);
-                if (font.size !== undefined && font.size !== defaultFontSize) {
-                    fontSizes.set(font.id, font.size);
+                const fontSize = this.tryNormalizeFontSize(font.size);
+                if (fontSize !== undefined && fontSize !== defaultFontSize) {
+                    fontSizes.set(font.id, fontSize);
                 }
             });
             cssRules.push(`.show-file-icons .file-icon::before, .show-file-icons .folder-icon::before, .show-file-icons .rootfolder-icon::before { font-family: '${fonts[0].id}'; font-size: ${defaultFontSize}; }`);
@@ -352,6 +353,19 @@ class FileIconThemeLoader {
         result.content = cssRules.join('\n');
         return result;
     }
+    tryNormalizeFontSize(size) {
+        if (!size) {
+            return undefined;
+        }
+        const defaultFontSizeInPx = 13;
+        if (size.endsWith('px')) {
+            const value = parseInt(size, 10);
+            if (!isNaN(value)) {
+                return Math.round((value / defaultFontSizeInPx) * 100) + '%';
+            }
+        }
+        return size;
+    }
 }
 function handleParentFolder(key, selectors) {
     const lastIndexOfSlash = key.lastIndexOf('/');

package/vscode/src/vs/workbench/services/themes/browser/productIconThemeData.js

@@ -38,7 +38,7 @@ class ProductIconThemeData {
         this.isLoaded = true;
         if (warnings.length) {
             logService.error(( localize(
-                7068,
+                6874,
                 "Problems processing product icons definitions in {0}:\n{1}",
                  (location.toString()),
                 warnings.join('\n')
@@ -69,7 +69,7 @@ class ProductIconThemeData {
     static get defaultTheme() {
         let themeData = ProductIconThemeData._defaultProductIconTheme;
         if (!themeData) {
-            themeData = ProductIconThemeData._defaultProductIconTheme = ( (new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(7069, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME)));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( (new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(6875, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME)));
             themeData.isLoaded = true;
             themeData.extensionData = undefined;
             themeData.watch = false;
@@ -156,17 +156,17 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
         const contentValue = parse(content, parseErrors);
         if (parseErrors.length > 0) {
             return Promise.reject(( (new Error(( localize(
-                7070,
+                6876,
                 "Problems parsing product icons file: {0}",
                 ( (parseErrors.map(e => getParseErrorMessage(e.error)))).join(', ')
             ))))));
         }
         else if (getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( (new Error(( localize(7071, "Invalid format for product icons theme file: Object expected."))))));
+            return Promise.reject(( (new Error(( localize(6877, "Invalid format for product icons theme file: Object expected."))))));
         }
         else if (!contentValue.iconDefinitions || !Array.isArray(contentValue.fonts) || !contentValue.fonts.length) {
             return Promise.reject(( (new Error(( localize(
-                7072,
+                6878,
                 "Invalid format for product icons theme file: Must contain iconDefinitions and fonts."
             ))))));
         }
@@ -180,14 +180,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     fontWeight = font.weight;
                 }
                 else {
-                    warnings.push(( localize(7073, 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(6879, 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id)));
                 }
                 let fontStyle = undefined;
                 if (isString(font.style) && font.style.match(fontStyleRegex)) {
                     fontStyle = font.style;
                 }
                 else {
-                    warnings.push(( localize(7074, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(6880, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
                 }
                 const sanitizedSrc = [];
                 if (Array.isArray(font.src)) {
@@ -197,7 +197,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                             sanitizedSrc.push({ location: iconFontLocation, format: s.format });
                         }
                         else {
-                            warnings.push(( localize(7075, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
+                            warnings.push(( localize(6881, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
                         }
                     }
                 }
@@ -206,7 +206,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                 }
                 else {
                     warnings.push(( localize(
-                        7076,
+                        6882,
                         'No valid font source in font \'{0}\'. Ignoring font definition.',
                         font.id
                     )));
@@ -214,7 +214,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
             }
             else {
                 warnings.push(( localize(
-                    7077,
+                    6883,
                     'Missing or invalid font id \'{0}\'. Skipping font definition.',
                     font.id
                 )));
@@ -232,11 +232,11 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     iconDefinitions.set(iconId, { fontCharacter: definition.fontCharacter, font });
                 }
                 else {
-                    warnings.push(( localize(7078, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
+                    warnings.push(( localize(6884, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
                 }
             }
             else {
-                warnings.push(( localize(7079, 'Skipping icon definition \'{0}\'. Unknown fontCharacter.', iconId)));
+                warnings.push(( localize(6885, 'Skipping icon definition \'{0}\'. Unknown fontCharacter.', iconId)));
             }
         }
         return { iconDefinitions };

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

@@ -369,7 +369,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         }
         catch (error) {
             throw ( new Error(localize(
-                3067,
+                2538,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message

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

@@ -135,31 +135,31 @@ const textmateColorSchema = {
         },
         settings: {
             type: 'object',
-            description: ( localize(7002, 'Colors and styles for the token.')),
+            description: ( localize(6770, 'Colors and styles for the token.')),
             properties: {
                 foreground: {
                     type: 'string',
-                    description: ( localize(7003, 'Foreground color for the token.')),
+                    description: ( localize(6771, 'Foreground color for the token.')),
                     format: 'color-hex',
                     default: '#ff0000'
                 },
                 background: {
                     type: 'string',
-                    deprecationMessage: ( localize(7004, 'Token background colors are currently not supported.'))
+                    deprecationMessage: ( localize(6772, 'Token background colors are currently not supported.'))
                 },
                 fontStyle: {
                     type: 'string',
                     description: ( localize(
-                        7005,
+                        6773,
                         'Font style of the rule: \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination. The empty string unsets inherited settings.'
                     )),
                     pattern: '^(\\s*\\b(italic|bold|underline|strikethrough))*\\s*$',
                     patternErrorMessage: ( localize(
-                        7006,
+                        6774,
                         'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'
                     )),
                     defaultSnippets: [
-                        { label: ( localize(7007, 'None (clear inherited style)')), bodyText: '""' },
+                        { label: ( localize(6775, 'None (clear inherited style)')), bodyText: '""' },
                         { body: 'italic' },
                         { body: 'bold' },
                         { body: 'underline' },
@@ -188,10 +188,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: 'string',
-                description: ( localize(7008, 'Description of the rule.'))
+                description: ( localize(6776, 'Description of the rule.'))
             },
             scope: {
-                description: ( localize(7009, 'Scope selector against which this rule matches.')),
+                description: ( localize(6777, 'Scope selector against which this rule matches.')),
                 anyOf: [
                     {
                         enum: textMateScopes
@@ -230,28 +230,28 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( localize(7010, 'Colors in the workbench')),
+            description: ( localize(6778, 'Colors in the workbench')),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                     type: 'string',
-                    description: ( localize(7011, 'Path to a tmTheme file (relative to the current file).'))
+                    description: ( localize(6779, 'Path to a tmTheme file (relative to the current file).'))
                 },
                 {
-                    description: ( localize(7012, 'Colors for syntax highlighting')),
+                    description: ( localize(6780, 'Colors for syntax highlighting')),
                     $ref: textmateColorsSchemaId
                 }
             ]
         },
         semanticHighlighting: {
             type: 'boolean',
-            description: ( localize(7013, 'Whether semantic highlighting should be enabled for this theme.'))
+            description: ( localize(6781, 'Whether semantic highlighting should be enabled for this theme.'))
         },
         semanticTokenColors: {
             type: 'object',
-            description: ( localize(7014, 'Colors for semantic tokens')),
+            description: ( localize(6782, 'Colors for semantic tokens')),
             $ref: tokenStylingSchemaId
         }
     }