@codingame/monaco-vscode-theme-service-override 16.1.0 → 17.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "16.1.0",
+  "version": "17.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": "16.1.0",
-    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "16.1.0",
-    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "16.1.0",
-    "@codingame/monaco-vscode-api": "16.1.0",
-    "@codingame/monaco-vscode-files-service-override": "16.1.0"
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.0.0",
+    "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "17.0.0",
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "17.0.0",
+    "@codingame/monaco-vscode-api": "17.0.0",
+    "@codingame/monaco-vscode-files-service-override": "17.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -7,7 +7,7 @@ import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 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 { IWorkbenchThemeService } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
+import { IWorkbenchThemeService } from '@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common/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';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
@@ -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(10985, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(11092, '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(10986, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(11093, "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(10987, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                    items = [{ label: `$(error) ${( localize(11094, '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(
-                10988,
+                11095,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(10989, "OK"))
+            primaryButton: ( localize(11096, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -245,7 +245,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(10990, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(11097, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -266,6 +266,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         this._queryDelayer.dispose();
         this._marketplaceExtensions.clear();
         this._marketplaceThemes.length = 0;
+        this._onDidChange.dispose();
     }
 };
 MarketplaceThemesPicker = ( __decorate([
@@ -392,7 +393,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(10991, 'Color Theme')),
+            title: ( localize2(11098, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -403,12 +404,12 @@ registerAction2(class extends Action2 {
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            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");
+            case ColorScheme.DARK: return localize(11099, "Select Color Theme for System Dark Mode");
+            case ColorScheme.LIGHT: return localize(11100, "Select Color Theme for System Light Mode");
+            case ColorScheme.HIGH_CONTRAST_DARK: return localize(11101, "Select Color Theme for High Contrast Dark Mode");
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return localize(11102, "Select Color Theme for High Contrast Light Mode");
             default:
-                return localize(10996, "Select Color Theme (detect system color mode disabled)");
+                return localize(11103, "Select Color Theme (detect system color mode disabled)");
         }
     }
     async run(accessor) {
@@ -418,7 +419,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(10997, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(11104, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -426,15 +427,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( new Toggle({
-                title: ( localize(10998, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(11105, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             }));
         }
         const options = {
-            installMessage: ( localize(10999, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(11000, "Browse Additional Color Themes...")),
+            installMessage: ( localize(11106, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(11107, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -449,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(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")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(11108, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(11109, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(11110, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -474,7 +475,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(11004, 'File Icon Theme')),
+            title: ( localize2(11111, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -482,8 +483,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(11005, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(11006, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(11112, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(11113, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -491,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(11007, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(11008, 'None')), description: ( localize(11009, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(11114, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(11115, 'None')), description: ( localize(11116, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -503,7 +504,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(11010, 'Product Icon Theme')),
+            title: ( localize2(11117, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -511,9 +512,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            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)")),
+            installMessage: ( localize(11118, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(11119, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(11120, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -521,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(11014, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(11015, 'Default')) },
+            { type: 'separator', label: ( localize(11121, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(11122, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -580,13 +581,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(11016, "Manage Extension")),
+    tooltip: ( localize(11123, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(11017, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(11124, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -636,7 +637,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(11018, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(11125, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -648,13 +649,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                11019,
+                11126,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity.Info, message, [
                 {
-                    label: ( localize(11020, "Open Settings")),
+                    label: ( localize(11127, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -692,7 +693,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(11021, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(11128, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -728,13 +729,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( new MenuId('ThemesSubMenu'));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(11022, "Themes")),
+    title: ( localize(11129, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(11023, "&&Themes")),
+    title: ( localize(11130, "&&Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -742,21 +743,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(10991, 'Color Theme'))
+        title: ( localize(11098, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(11024, "File Icon Theme"))
+        title: ( localize(11131, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(11025, "Product Icon Theme"))
+        title: ( localize(11132, "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(
-                    12478,
+                    12607,
                     "Problems parsing file icons file: {0}",
                     ( errors.map(e => getParseErrorMessage(e.error))).join(', ')
                 )))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( new Error(( localize(12479, "Invalid format for file icons theme file: Object expected.")))));
+                return Promise.reject(( new Error(( localize(12608, "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(
-                12480,
+                12609,
                 "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(12481, 'Default')), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(12610, '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(
-                12482,
+                12611,
                 "Problems parsing product icons file: {0}",
                 ( parseErrors.map(e => getParseErrorMessage(e.error))).join(', ')
             )))));
         }
         else if (getNodeType(contentValue) !== 'object') {
-            return Promise.reject(( new Error(( localize(12483, "Invalid format for product icons theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(12612, "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(
-                12484,
+                12613,
                 "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(12485, 'Invalid font weight in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(12614, '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(12486, 'Invalid font style in font \'{0}\'. Ignoring setting.', font.id)));
+                    warnings.push(( localize(12615, '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(12487, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
+                            warnings.push(( localize(12616, 'Invalid font source in font \'{0}\'. Ignoring source.', font.id)));
                         }
                     }
                 }
@@ -207,7 +207,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                 }
                 else {
                     warnings.push(( localize(
-                        12488,
+                        12617,
                         '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(
-                    12489,
+                    12618,
                     '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(12490, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
+                    warnings.push(( localize(12619, 'Skipping icon definition \'{0}\'. Unknown font.', iconId)));
                 }
             }
             else {
-                warnings.push(( localize(12491, 'Skipping icon definition \'{0}\': Needs to be defined', iconId)));
+                warnings.push(( localize(12620, 'Skipping icon definition \'{0}\': Needs to be defined', iconId)));
             }
         }
         return { iconDefinitions };

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

@@ -1,13 +1,13 @@
 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 { IWorkbenchThemeService } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
+import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-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";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 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-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/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

@@ -15,10 +15,10 @@ import { ColorThemeData } from '@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc
 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, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
 import { createStyleSheet, shadowRootContainer } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/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(
-                12492,
+                12621,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message
@@ -662,24 +662,25 @@ class ThemeFileWatcher {
         this.fileService = fileService;
         this.environmentService = environmentService;
         this.onUpdate = onUpdate;
+        this.watcherDisposables = ( new DisposableStore());
     }
     update(theme) {
         if (!isEqual(theme.location, this.watchedLocation)) {
-            this.dispose();
+            this.watchedLocation = undefined;
+            this.watcherDisposables.clear();
             if (theme.location && (theme.watch || this.environmentService.isExtensionDevelopment)) {
                 this.watchedLocation = theme.location;
-                this.watcherDisposable = this.fileService.watch(theme.location);
-                this.fileService.onDidFilesChange(e => {
+                this.watcherDisposables.add(this.fileService.watch(theme.location));
+                this.watcherDisposables.add(this.fileService.onDidFilesChange(e => {
                     if (this.watchedLocation && e.contains(this.watchedLocation, FileChangeType.UPDATED)) {
                         this.onUpdate();
                     }
-                });
+                }));
             }
         }
     }
     dispose() {
-        this.watcherDisposable = dispose(this.watcherDisposable);
-        this.fileChangeListener = dispose(this.fileChangeListener);
+        this.watcherDisposables.dispose();
         this.watchedLocation = undefined;
     }
 }

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-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/platform/theme/common/tokenClassificationRegistry';
+import { tokenStylingSchemaId } from '@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 
 const textMateScopes = [
     'comment',
@@ -136,31 +136,31 @@ const textmateColorSchema = {
         },
         settings: {
             type: 'object',
-            description: ( localize(12523, 'Colors and styles for the token.')),
+            description: ( localize(12652, 'Colors and styles for the token.')),
             properties: {
                 foreground: {
                     type: 'string',
-                    description: ( localize(12524, 'Foreground color for the token.')),
+                    description: ( localize(12653, 'Foreground color for the token.')),
                     format: 'color-hex',
                     default: '#ff0000'
                 },
                 background: {
                     type: 'string',
-                    deprecationMessage: ( localize(12525, 'Token background colors are currently not supported.'))
+                    deprecationMessage: ( localize(12654, 'Token background colors are currently not supported.'))
                 },
                 fontStyle: {
                     type: 'string',
                     description: ( localize(
-                        12526,
+                        12655,
                         '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(
-                        12527,
+                        12656,
                         'Font style must be \'italic\', \'bold\', \'underline\', \'strikethrough\' or a combination or the empty string.'
                     )),
                     defaultSnippets: [
-                        { label: ( localize(12528, 'None (clear inherited style)')), bodyText: '""' },
+                        { label: ( localize(12657, 'None (clear inherited style)')), bodyText: '""' },
                         { body: 'italic' },
                         { body: 'bold' },
                         { body: 'underline' },
@@ -189,10 +189,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: 'string',
-                description: ( localize(12529, 'Description of the rule.'))
+                description: ( localize(12658, 'Description of the rule.'))
             },
             scope: {
-                description: ( localize(12530, 'Scope selector against which this rule matches.')),
+                description: ( localize(12659, 'Scope selector against which this rule matches.')),
                 anyOf: [
                     {
                         enum: textMateScopes
@@ -231,28 +231,28 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( localize(12531, 'Colors in the workbench')),
+            description: ( localize(12660, 'Colors in the workbench')),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                     type: 'string',
-                    description: ( localize(12532, 'Path to a tmTheme file (relative to the current file).'))
+                    description: ( localize(12661, 'Path to a tmTheme file (relative to the current file).'))
                 },
                 {
-                    description: ( localize(12533, 'Colors for syntax highlighting')),
+                    description: ( localize(12662, 'Colors for syntax highlighting')),
                     $ref: textmateColorsSchemaId
                 }
             ]
         },
         semanticHighlighting: {
             type: 'boolean',
-            description: ( localize(12534, 'Whether semantic highlighting should be enabled for this theme.'))
+            description: ( localize(12663, 'Whether semantic highlighting should be enabled for this theme.'))
         },
         semanticTokenColors: {
             type: 'object',
-            description: ( localize(12535, 'Colors for semantic tokens')),
+            description: ( localize(12664, 'Colors for semantic tokens')),
             $ref: tokenStylingSchemaId
         }
     }