@codingame/monaco-vscode-theme-service-override 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - theme service-override",
   "keywords": [],
@@ -15,11 +15,11 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.2",
-    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.2",
-    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-files-service-override": "15.0.2"
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.0.0",
+    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "16.0.0",
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-files-service-override": "16.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -28,6 +28,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

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

@@ -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(10663, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(10985, '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(10664, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(10986, "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(10665, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                    items = [{ label: `$(error) ${( localize(10987, '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(
-                10666,
+                10988,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(10667, "OK"))
+            primaryButton: ( localize(10989, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -245,7 +245,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(10668, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(10990, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -291,7 +291,7 @@ let InstalledThemesPicker = class InstalledThemesPicker {
     async openQuickPick(picks, currentTheme) {
         let marketplaceThemePicker;
         if (this.extensionGalleryService.isEnabled()) {
-            if (this.extensionResourceLoaderService.supportsExtensionGalleryResources && this.options.browseMessage) {
+            if ((await this.extensionResourceLoaderService.supportsExtensionGalleryResources()) && this.options.browseMessage) {
                 marketplaceThemePicker = this.instantiationService.createInstance(MarketplaceThemesPicker, this.getMarketplaceColorThemes.bind(this), this.options.marketplaceTag);
                 picks = [configurationEntry(this.options.browseMessage, ConfigureItem.BROWSE_GALLERY), ...picks];
             }
@@ -392,7 +392,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(10669, 'Color Theme')),
+            title: ( localize2(10991, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -403,12 +403,12 @@ registerAction2(class extends Action2 {
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            case ColorScheme.DARK: return localize(10670, "Select Color Theme for System Dark Mode");
-            case ColorScheme.LIGHT: return localize(10671, "Select Color Theme for System Light Mode");
-            case ColorScheme.HIGH_CONTRAST_DARK: return localize(10672, "Select Color Theme for High Contrast Dark Mode");
-            case ColorScheme.HIGH_CONTRAST_LIGHT: return localize(10673, "Select Color Theme for High Contrast Light Mode");
+            case ColorScheme.DARK: return localize(10992, "Select Color Theme for System Dark Mode");
+            case ColorScheme.LIGHT: return localize(10993, "Select Color Theme for System Light Mode");
+            case ColorScheme.HIGH_CONTRAST_DARK: return localize(10994, "Select Color Theme for High Contrast Dark Mode");
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return localize(10995, "Select Color Theme for High Contrast Light Mode");
             default:
-                return localize(10674, "Select Color Theme (detect system color mode disabled)");
+                return localize(10996, "Select Color Theme (detect system color mode disabled)");
         }
     }
     async run(accessor) {
@@ -418,7 +418,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(10675, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(10997, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -426,15 +426,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(10676, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(10998, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             }));
         }
         const options = {
-            installMessage: ( localize(10677, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(10678, "Browse Additional Color Themes...")),
+            installMessage: ( localize(10999, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(11000, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -449,9 +449,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(10679, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(10680, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(10681, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(11001, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(11002, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(11003, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -474,7 +474,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(10682, 'File Icon Theme')),
+            title: ( localize2(11004, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -482,8 +482,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(10683, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(10684, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(11005, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(11006, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -491,8 +491,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(10685, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(10686, 'None')), description: ( localize(10687, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(11007, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(11008, 'None')), description: ( localize(11009, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -503,7 +503,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(10688, 'Product Icon Theme')),
+            title: ( localize2(11010, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -511,9 +511,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(10689, "Install Additional Product Icon Themes...")),
-            browseMessage: '$(plus) ' + ( localize(10690, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(10691, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(11011, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(11012, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(11013, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -521,8 +521,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(10692, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(10693, 'Default')) },
+            { type: 'separator', label: ( localize(11014, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(11015, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -580,13 +580,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(10694, "Manage Extension")),
+    tooltip: ( localize(11016, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(10695, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(11017, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -636,7 +636,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(10696, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(11018, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -648,13 +648,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                10697,
+                11019,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity.Info, message, [
                 {
-                    label: ( localize(10698, "Open Settings")),
+                    label: ( localize(11020, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -692,7 +692,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(10699, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(11021, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -703,7 +703,7 @@ registerAction2(class extends Action2 {
         const extensionGalleryService = accessor.get(IExtensionGalleryService);
         const extensionResourceLoaderService = accessor.get(IExtensionResourceLoaderService);
         const instantiationService = accessor.get(IInstantiationService);
-        if (!extensionGalleryService.isEnabled() || !extensionResourceLoaderService.supportsExtensionGalleryResources) {
+        if (!extensionGalleryService.isEnabled() || !(await extensionResourceLoaderService.supportsExtensionGalleryResources())) {
             return;
         }
         const currentTheme = themeService.getColorTheme();
@@ -728,13 +728,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( new MenuId('ThemesSubMenu'));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(10700, "Themes")),
+    title: ( localize(11022, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(10701, "&&Theme")),
+    title: ( localize(11023, "&&Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -742,21 +742,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(10669, 'Color Theme'))
+        title: ( localize(10991, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(10702, "File Icon Theme"))
+        title: ( localize(11024, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(10703, "Product Icon Theme"))
+        title: ( localize(11025, "Product Icon Theme"))
     },
     order: 3
 });

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

@@ -141,13 +141,13 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( new Error(( localize(
-                    12143,
+                    12478,
                     "Problems parsing file icons file: {0}",
                     ( errors.map(e => getParseErrorMessage(e.error))).join(', ')
                 )))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( new Error(( localize(12144, "Invalid format for file icons theme file: Object expected.")))));
+                return Promise.reject(( new Error(( localize(12479, "Invalid format for file icons theme file: Object expected.")))));
             }
             return Promise.resolve(contentValue);
         });

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

@@ -39,7 +39,7 @@ class ProductIconThemeData {
         this.isLoaded = true;
         if (warnings.length) {
             logService.error(( localize(
-                12145,
+                12480,
                 "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(12146, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(12481, '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(
-                12147,
+                12482,
                 "Problems parsing product icons file: {0}",
                 ( parseErrors.map(e => getParseErrorMessage(e.error))).join(', ')
             )))));
         }
         else if (getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( new Error(( localize(12148, "Invalid format for product icons theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(12483, "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(
-                12149,
+                12484,
                 "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(12150, 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(12485, '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(12151, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(12486, '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(12152, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
+                            warnings.push(( localize(12487, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
                         }
                     }
                 }
@@ -207,7 +207,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                 }
                 else {
                     warnings.push(( localize(
-                        12153,
+                        12488,
                         '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(
-                    12154,
+                    12489,
                     '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(12155, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
+                    warnings.push(( localize(12490, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
                 }
             }
             else {
-                warnings.push(( localize(12156, 'Skipping icon definition \'{0}\': Needs to be defined', iconId)));
+                warnings.push(( localize(12491, '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, IWorkbenchThemeChangeEvent } 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-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
 import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/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";
@@ -56,7 +56,7 @@ export declare class WorkbenchThemeService extends Disposable implements IWorkbe
     getColorThemes(): Promise<IWorkbenchColorTheme[]>;
     getPreferredColorScheme(): ColorScheme | undefined;
     getMarketplaceColorThemes(publisher: string, name: string, version: string): Promise<IWorkbenchColorTheme[]>;
-    get onDidColorThemeChange(): Event<IWorkbenchThemeChangeEvent>;
+    get onDidColorThemeChange(): Event<IWorkbenchColorTheme>;
     setColorTheme(themeIdOrTheme: string | undefined | IWorkbenchColorTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchColorTheme | null>;
     private internalSetColorTheme;
     private reloadCurrentColorTheme;

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

@@ -120,7 +120,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         this.onProductIconThemeChange = ( new Emitter());
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
         this.productIconThemeSequencer = ( new Sequencer());
-        this._register(this.onDidColorThemeChange(e => getColorRegistry().notifyThemeUpdate(e.theme)));
+        this._register(this.onDidColorThemeChange(theme => getColorRegistry().notifyThemeUpdate(theme)));
         let themeData = ColorThemeData.fromStorageData(this.storageService);
         const colorThemeSetting = this.settings.colorTheme;
         if (themeData && colorThemeSetting !== themeData.settingsId) {
@@ -240,7 +240,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
                 }
                 if (hasColorChanges) {
                     this.updateDynamicCSSRules(this.currentColorTheme);
-                    this.onColorThemeChange.fire({ theme: this.currentColorTheme, target: 'auto' });
+                    this.onColorThemeChange.fire(this.currentColorTheme);
                 }
             }
         }));
@@ -322,7 +322,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         return this.settings.getPreferredColorScheme();
     }
     async getMarketplaceColorThemes(publisher, name, version) {
-        const extensionLocation = this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
+        const extensionLocation = await this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
         if (extensionLocation) {
             try {
                 const manifestContent = await this.extensionResourceLoaderService.readExtensionResource(joinPath(extensionLocation, 'package.json'));
@@ -369,7 +369,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         }
         catch (error) {
             throw ( new Error(( localize(
-                12157,
+                12492,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message
@@ -447,7 +447,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         if (silent) {
             return Promise.resolve(null);
         }
-        this.onColorThemeChange.fire({ theme: this.currentColorTheme, target: settingsTarget });
+        this.onColorThemeChange.fire(this.currentColorTheme);
         if (newTheme.isLoaded && settingsTarget !== 'preview') {
             newTheme.toStorage(this.storageService);
         }
@@ -506,7 +506,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         return themeData;
     }
     async getMarketplaceFileIconThemes(publisher, name, version) {
-        const extensionLocation = this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
+        const extensionLocation = await this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
         if (extensionLocation) {
             try {
                 const manifestContent = await this.extensionResourceLoaderService.readExtensionResource(joinPath(extensionLocation, 'package.json'));
@@ -596,7 +596,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         return themeData;
     }
     async getMarketplaceProductIconThemes(publisher, name, version) {
-        const extensionLocation = this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
+        const extensionLocation = await this.extensionResourceLoaderService.getExtensionGalleryResourceURL({ publisher, name, version }, 'extension');
         if (extensionLocation) {
             try {
                 const manifestContent = await this.extensionResourceLoaderService.readExtensionResource(joinPath(extensionLocation, 'package.json'));

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

@@ -136,31 +136,31 @@ const textmateColorSchema = {
         },
         settings: {
             type: 'object',
-            description: ( localize(12188, 'Colors and styles for the token.')),
+            description: ( localize(12523, 'Colors and styles for the token.')),
             properties: {
                 foreground: {
                     type: 'string',
-                    description: ( localize(12189, 'Foreground color for the token.')),
+                    description: ( localize(12524, 'Foreground color for the token.')),
                     format: 'color-hex',
                     default: '#ff0000'
                 },
                 background: {
                     type: 'string',
-                    deprecationMessage: ( localize(12190, 'Token background colors are currently not supported.'))
+                    deprecationMessage: ( localize(12525, 'Token background colors are currently not supported.'))
                 },
                 fontStyle: {
                     type: 'string',
                     description: ( localize(
-                        12191,
+                        12526,
                         '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(
-                        12192,
+                        12527,
                         'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'
                     )),
                     defaultSnippets: [
-                        { label: ( localize(12193, 'None (clear inherited style)')), bodyText: '""' },
+                        { label: ( localize(12528, 'None (clear inherited style)')), bodyText: '""' },
                         { body: 'italic' },
                         { body: 'bold' },
                         { body: 'underline' },
@@ -189,10 +189,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: 'string',
-                description: ( localize(12194, 'Description of the rule.'))
+                description: ( localize(12529, 'Description of the rule.'))
             },
             scope: {
-                description: ( localize(12195, 'Scope selector against which this rule matches.')),
+                description: ( localize(12530, 'Scope selector against which this rule matches.')),
                 anyOf: [
                     {
                         enum: textMateScopes
@@ -231,28 +231,28 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( localize(12196, 'Colors in the workbench')),
+            description: ( localize(12531, 'Colors in the workbench')),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                     type: 'string',
-                    description: ( localize(12197, 'Path to a tmTheme file (relative to the current file).'))
+                    description: ( localize(12532, 'Path to a tmTheme file (relative to the current file).'))
                 },
                 {
-                    description: ( localize(12198, 'Colors for syntax highlighting')),
+                    description: ( localize(12533, 'Colors for syntax highlighting')),
                     $ref: textmateColorsSchemaId
                 }
             ]
         },
         semanticHighlighting: {
             type: 'boolean',
-            description: ( localize(12199, 'Whether semantic highlighting should be enabled for this theme.'))
+            description: ( localize(12534, 'Whether semantic highlighting should be enabled for this theme.'))
         },
         semanticTokenColors: {
             type: 'object',
-            description: ( localize(12200, 'Colors for semantic tokens')),
+            description: ( localize(12535, 'Colors for semantic tokens')),
             $ref: tokenStylingSchemaId
         }
     }