@codingame/monaco-vscode-theme-service-override 23.3.0 → 24.1.0

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { IThemeExtensionPoint } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+import type { IThemeExtensionPoint } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import type { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
 type PartialIThemeExtensionPoint = Partial<IThemeExtensionPoint> & Pick<IThemeExtensionPoint, "id" | "path">;
 export default function getServiceOverride(): IEditorOverrideServices;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - theme service-override",
   "keywords": [],
@@ -15,11 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-10416640-ca84-5eff-95ce-dea977ccba7a-common": "23.3.0",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.3.0",
-    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "23.3.0",
-    "@codingame/monaco-vscode-api": "23.3.0",
-    "@codingame/monaco-vscode-files-service-override": "23.3.0"
+    "@codingame/monaco-vscode-api": "24.1.0",
+    "@codingame/monaco-vscode-files-service-override": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -6,7 +6,7 @@ import { registerAction2, Action2, MenuId, MenuRegistry } from '@codingame/monac
 import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
-import { ThemeSettings } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { IWorkbenchThemeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IExtensionGalleryService, IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
@@ -53,7 +53,7 @@ import { defaultToggleStyles } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(12582, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(12722, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
 var ConfigureItem;
 (function (ConfigureItem) {
     ConfigureItem["BROWSE_GALLERY"] = "marketplace";
@@ -161,7 +161,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
             quickpick.matchOnDescription = true;
             quickpick.buttons = [this.quickInputService.backButton];
             quickpick.title = 'Marketplace Themes';
-            quickpick.placeholder = ( localize(12583, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(12723, "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 (_) => {
@@ -213,7 +213,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
                     items = items.concat({ label: '$(loading~spin) Searching for themes...', id: undefined, alwaysShow: true });
                 }
                 else if (items.length === 0 && this._searchError) {
-                    items = [{ label: `$(error) ${( localize(12584, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                    items = [{ label: `$(error) ${( localize(12724, '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;
@@ -232,12 +232,12 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
         const result = await this.dialogService.confirm({
             message: ( localize(
-                12585,
+                12725,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(12586, "OK"))
+            primaryButton: ( localize(12726, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -245,7 +245,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(12587, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(12727, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -393,7 +393,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(12588, 'Color Theme')),
+            title: ( localize2(12728, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -404,12 +404,12 @@ registerAction2(class extends Action2 {
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            case ColorScheme.DARK: return localize(12589, "Select Color Theme for System Dark Mode");
-            case ColorScheme.LIGHT: return localize(12590, "Select Color Theme for System Light Mode");
-            case ColorScheme.HIGH_CONTRAST_DARK: return localize(12591, "Select Color Theme for High Contrast Dark Mode");
-            case ColorScheme.HIGH_CONTRAST_LIGHT: return localize(12592, "Select Color Theme for High Contrast Light Mode");
+            case ColorScheme.DARK: return localize(12729, "Select Color Theme for System Dark Mode");
+            case ColorScheme.LIGHT: return localize(12730, "Select Color Theme for System Light Mode");
+            case ColorScheme.HIGH_CONTRAST_DARK: return localize(12731, "Select Color Theme for High Contrast Dark Mode");
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return localize(12732, "Select Color Theme for High Contrast Light Mode");
             default:
-                return localize(12593, "Select Color Theme (detect system color mode disabled)");
+                return localize(12733, "Select Color Theme (detect system color mode disabled)");
         }
     }
     async run(accessor) {
@@ -419,7 +419,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(12594, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(12734, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -427,15 +427,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(12595, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(12735, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             }));
         }
         const options = {
-            installMessage: ( localize(12596, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(12597, "Browse Additional Color Themes...")),
+            installMessage: ( localize(12736, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(12737, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -450,9 +450,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(12598, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(12599, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(12600, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(12738, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(12739, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(12740, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -475,7 +475,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(12601, 'File Icon Theme')),
+            title: ( localize2(12741, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -483,8 +483,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(12602, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(12603, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(12742, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(12743, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -492,8 +492,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(12604, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(12605, 'None')), description: ( localize(12606, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(12744, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(12745, 'None')), description: ( localize(12746, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -504,7 +504,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(12607, 'Product Icon Theme')),
+            title: ( localize2(12747, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -512,9 +512,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(12608, "Install Additional Product Icon Themes...")),
-            browseMessage: '$(plus) ' + ( localize(12609, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(12610, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(12748, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(12749, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(12750, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -522,8 +522,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(12611, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(12612, 'Default')) },
+            { type: 'separator', label: ( localize(12751, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(12752, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -581,13 +581,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(12613, "Manage Extension")),
+    tooltip: ( localize(12753, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(12614, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(12754, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -637,7 +637,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(12615, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(12755, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -649,13 +649,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                12616,
+                12756,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity.Info, message, [
                 {
-                    label: ( localize(12617, "Open Settings")),
+                    label: ( localize(12757, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -693,7 +693,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(12618, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(12758, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -734,13 +734,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( new MenuId('ThemesSubMenu'));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(12619, "Themes")),
+    title: ( localize(12759, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(12620, "&&Themes")),
+    title: ( localize(12760, "&&Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -748,21 +748,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(12588, 'Color Theme'))
+        title: ( localize(12728, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(12621, "File Icon Theme"))
+        title: ( localize(12761, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(12622, "Product Icon Theme"))
+        title: ( localize(12762, "Product Icon Theme"))
     },
     order: 3
 });

package/vscode/src/vs/workbench/services/themes/browser/fileIconThemeData.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ExtensionData, IThemeExtensionPoint, IWorkbenchFileIconTheme } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+import { ExtensionData, IThemeExtensionPoint, IWorkbenchFileIconTheme } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";

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

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { parse, getNodeType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { ExtensionData } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonErrorMessages';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { fontColorRegex, fontSizeRegex } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
@@ -141,13 +141,13 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( new Error(( localize(
-                    14119,
+                    14260,
                     "Problems parsing file icons file: {0}",
                     ( errors.map(e => getParseErrorMessage(e.error))).join(', ')
                 )))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( new Error(( localize(14120, "Invalid format for file icons theme file: Object expected.")))));
+                return Promise.reject(( new Error(( localize(14261, "Invalid format for file icons theme file: Object expected.")))));
             }
             return Promise.resolve(contentValue);
         });

package/vscode/src/vs/workbench/services/themes/browser/productIconThemeData.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ExtensionData, IThemeExtensionPoint, IWorkbenchProductIconTheme } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+import { ExtensionData, IThemeExtensionPoint, IWorkbenchProductIconTheme } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IconDefinition, IconContribution } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry";

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

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { parse, getNodeType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { ThemeSettingDefaults, ExtensionData } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettingDefaults, ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonErrorMessages';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { isObject, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -39,7 +39,7 @@ class ProductIconThemeData {
         this.isLoaded = true;
         if (warnings.length) {
             logService.error(( localize(
-                14121,
+                14262,
                 "Problems processing product icons definitions in {0}:\n{1}",
                 (location.toString()),
                 warnings.join('\n')
@@ -70,7 +70,7 @@ class ProductIconThemeData {
     static get defaultTheme() {
         let themeData = ProductIconThemeData._defaultProductIconTheme;
         if (!themeData) {
-            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(14122, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(14263, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
             themeData.isLoaded = true;
             themeData.extensionData = undefined;
             themeData.watch = false;
@@ -157,17 +157,17 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
         const contentValue = parse(content, parseErrors);
         if (parseErrors.length > 0) {
             return Promise.reject(( new Error(( localize(
-                14123,
+                14264,
                 "Problems parsing product icons file: {0}",
                 ( parseErrors.map(e => getParseErrorMessage(e.error))).join(', ')
             )))));
         }
         else if (getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( new Error(( localize(14124, "Invalid format for product icons theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(14265, "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(
-                14125,
+                14266,
                 "Invalid format for product icons theme file: Must contain iconDefinitions and fonts."
             )))));
         }
@@ -181,14 +181,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     fontWeight = font.weight;
                 }
                 else {
-                    warnings.push(( localize(14126, 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(14267, '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(14127, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(14268, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
                 }
                 const sanitizedSrc = [];
                 if (Array.isArray(font.src)) {
@@ -198,7 +198,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                             sanitizedSrc.push({ location: iconFontLocation, format: s.format });
                         }
                         else {
-                            warnings.push(( localize(14128, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
+                            warnings.push(( localize(14269, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
                         }
                     }
                 }
@@ -207,7 +207,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                 }
                 else {
                     warnings.push(( localize(
-                        14129,
+                        14270,
                         'No valid font source in font \'{0}\'. Ignoring font definition.',
                         font.id
                     )));
@@ -215,7 +215,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
             }
             else {
                 warnings.push(( localize(
-                    14130,
+                    14271,
                     'Missing or invalid font id \'{0}\'. Skipping font definition.',
                     font.id
                 )));
@@ -233,11 +233,11 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     iconDefinitions.set(iconId, { fontCharacter: definition.fontCharacter, font });
                 }
                 else {
-                    warnings.push(( localize(14131, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
+                    warnings.push(( localize(14272, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
                 }
             }
             else {
-                warnings.push(( localize(14132, 'Skipping icon definition \'{0}\': Needs to be defined', iconId)));
+                warnings.push(( localize(14273, 'Skipping icon definition \'{0}\': Needs to be defined', iconId)));
             }
         }
         return { iconDefinitions };

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

@@ -1,5 +1,5 @@
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettingTarget } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+import { IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettingTarget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IWorkbenchThemeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -7,7 +7,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { FileIconThemeData } from "./fileIconThemeData.js";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isUndefined, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { ThemeSettingDefaults, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS, ThemeSettings, ExtensionData } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettingDefaults, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS, ThemeSettings, ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -11,14 +11,14 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { ColorThemeData } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/colorThemeData';
+import { ColorThemeData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/colorThemeData';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
 import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { FileChangeType } 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';
 import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -369,7 +369,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         }
         catch (error) {
             throw ( new Error(( localize(
-                14133,
+                14274,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message

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

@@ -13,7 +13,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
-import { tokenStylingSchemaId } from '@codingame/monaco-vscode-10416640-ca84-5eff-95ce-dea977ccba7a-common/vscode/vs/platform/theme/common/tokenClassificationRegistry';
+import { tokenStylingSchemaId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 
 const textMateScopes = [
     'comment',
@@ -136,31 +136,31 @@ const textmateColorSchema = {
         },
         settings: {
             type: 'object',
-            description: ( localize(14164, 'Colors and styles for the token.')),
+            description: ( localize(14305, 'Colors and styles for the token.')),
             properties: {
                 foreground: {
                     type: 'string',
-                    description: ( localize(14165, 'Foreground color for the token.')),
+                    description: ( localize(14306, 'Foreground color for the token.')),
                     format: 'color-hex',
                     default: '#ff0000'
                 },
                 background: {
                     type: 'string',
-                    deprecationMessage: ( localize(14166, 'Token background colors are currently not supported.'))
+                    deprecationMessage: ( localize(14307, 'Token background colors are currently not supported.'))
                 },
                 fontStyle: {
                     type: 'string',
                     description: ( localize(
-                        14167,
+                        14308,
                         '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(
-                        14168,
+                        14309,
                         'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'
                     )),
                     defaultSnippets: [
-                        { label: ( localize(14169, 'None (clear inherited style)')), bodyText: '""' },
+                        { label: ( localize(14310, 'None (clear inherited style)')), bodyText: '""' },
                         { body: 'italic' },
                         { body: 'bold' },
                         { body: 'underline' },
@@ -189,10 +189,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: 'string',
-                description: ( localize(14170, 'Description of the rule.'))
+                description: ( localize(14311, 'Description of the rule.'))
             },
             scope: {
-                description: ( localize(14171, 'Scope selector against which this rule matches.')),
+                description: ( localize(14312, 'Scope selector against which this rule matches.')),
                 anyOf: [
                     {
                         enum: textMateScopes
@@ -231,28 +231,28 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( localize(14172, 'Colors in the workbench')),
+            description: ( localize(14313, 'Colors in the workbench')),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                     type: 'string',
-                    description: ( localize(14173, 'Path to a tmTheme file (relative to the current file).'))
+                    description: ( localize(14314, 'Path to a tmTheme file (relative to the current file).'))
                 },
                 {
-                    description: ( localize(14174, 'Colors for syntax highlighting')),
+                    description: ( localize(14315, 'Colors for syntax highlighting')),
                     $ref: textmateColorsSchemaId
                 }
             ]
         },
         semanticHighlighting: {
             type: 'boolean',
-            description: ( localize(14175, 'Whether semantic highlighting should be enabled for this theme.'))
+            description: ( localize(14316, 'Whether semantic highlighting should be enabled for this theme.'))
         },
         semanticTokenColors: {
             type: 'object',
-            description: ( localize(14176, 'Colors for semantic tokens')),
+            description: ( localize(14317, 'Colors for semantic tokens')),
             $ref: tokenStylingSchemaId
         }
     }