@codingame/monaco-vscode-theme-service-override 26.2.2 → 27.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "26.2.2",
+  "version": "27.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - theme service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2",
-    "@codingame/monaco-vscode-files-service-override": "26.2.2"
+    "@codingame/monaco-vscode-api": "27.0.0",
+    "@codingame/monaco-vscode-files-service-override": "27.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -52,7 +52,7 @@ import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/work
 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(13322, "Icon for the 'Manage' action in the theme selection quick pick.")));
+const manageExtensionIcon = registerIcon("theme-selection-manage-extension", Codicon.gear, ( localize(14172, "Icon for the 'Manage' action in the theme selection quick pick.")));
 var ConfigureItem;
 (function(ConfigureItem) {
     ConfigureItem["BROWSE_GALLERY"] = "marketplace";
@@ -178,7 +178,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
             quickpick.matchOnDescription = true;
             quickpick.buttons = [this.quickInputService.backButton];
             quickpick.title = "Marketplace Themes";
-            quickpick.placeholder = ( localize(13323, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(14173, "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 _ => {
@@ -232,7 +232,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
                     });
                 } else if (items.length === 0 && this._searchError) {
                     items = [{
-                        label: `$(error) ${( localize(13324, "Error while searching for themes: {0}", this._searchError))}`,
+                        label: `$(error) ${( localize(14174, "Error while searching for themes: {0}", this._searchError))}`,
                         id: undefined,
                         alwaysShow: true
                     }];
@@ -254,12 +254,12 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
         const result = await this.dialogService.confirm({
             message: ( localize(
-                13325,
+                14175,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(13326, "OK"))
+            primaryButton: ( localize(14176, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -267,7 +267,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(13327, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(14177, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false
@@ -418,7 +418,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(13328, "Color Theme")),
+            title: ( localize2(14178, "Color Theme")),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -430,15 +430,15 @@ registerAction2(class extends Action2 {
     getTitle(colorScheme) {
         switch (colorScheme) {
         case ColorScheme.DARK:
-            return localize(13329, "Select Color Theme for System Dark Mode");
+            return localize(14179, "Select Color Theme for System Dark Mode");
         case ColorScheme.LIGHT:
-            return localize(13330, "Select Color Theme for System Light Mode");
+            return localize(14180, "Select Color Theme for System Light Mode");
         case ColorScheme.HIGH_CONTRAST_DARK:
-            return localize(13331, "Select Color Theme for High Contrast Dark Mode");
+            return localize(14181, "Select Color Theme for High Contrast Dark Mode");
         case ColorScheme.HIGH_CONTRAST_LIGHT:
-            return localize(13332, "Select Color Theme for High Contrast Light Mode");
+            return localize(14182, "Select Color Theme for High Contrast Light Mode");
         default:
-            return localize(13333, "Select Color Theme (detect system color mode disabled)");
+            return localize(14183, "Select Color Theme (detect system color mode disabled)");
         }
     }
     async run(accessor) {
@@ -446,13 +446,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         const preferredColorScheme = themeService.getPreferredColorScheme();
         const modeConfigureButton = {
-            tooltip: preferredColorScheme ? ( localize(13334, "Detect system color mode enabled. Click to configure.")) : ( localize(13335, "Detect system color mode disabled. Click to configure.")),
+            tooltip: preferredColorScheme ? ( localize(14184, "Detect system color mode enabled. Click to configure.")) : ( localize(14185, "Detect system color mode disabled. Click to configure.")),
             iconClass: ThemeIcon.asClassName(Codicon.colorMode),
             location: QuickInputButtonLocation.Inline
         };
         const options = {
-            installMessage: ( localize(13336, "Install Additional Color Themes...")),
-            browseMessage: "$(plus) " + ( localize(13337, "Browse Additional Color Themes...")),
+            installMessage: ( localize(14186, "Install Additional Color Themes...")),
+            browseMessage: "$(plus) " + ( localize(14187, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: "category:themes",
             buttons: [modeConfigureButton],
@@ -469,9 +469,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(13338, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(13339, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(13340, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(14188, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(14189, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(14190, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
         case ColorScheme.DARK:
@@ -494,7 +494,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(13341, "File Icon Theme")),
+            title: ( localize2(14191, "File Icon Theme")),
             category: Categories.Preferences,
             f1: true
         });
@@ -502,8 +502,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(13342, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(13343, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(14192, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(14193, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: "tag:icon-theme"
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -512,12 +512,12 @@ registerAction2(class extends Action2 {
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [{
             type: "separator",
-            label: ( localize(13344, "file icon themes"))
+            label: ( localize(14194, "file icon themes"))
         }, {
             id: "",
             theme: FileIconThemeData.noIconTheme,
-            label: ( localize(13345, "None")),
-            description: ( localize(13346, "Disable File Icons"))
+            label: ( localize(14195, "None")),
+            description: ( localize(14196, "Disable File Icons"))
         }, ...toEntries(await themeService.getFileIconThemes())];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
     }
@@ -527,7 +527,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(13347, "Product Icon Theme")),
+            title: ( localize2(14197, "Product Icon Theme")),
             category: Categories.Preferences,
             f1: true
         });
@@ -535,9 +535,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(13348, "Install Additional Product Icon Themes...")),
-            browseMessage: "$(plus) " + ( localize(13349, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(13350, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(14198, "Install Additional Product Icon Themes...")),
+            browseMessage: "$(plus) " + ( localize(14199, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(14200, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: "tag:product-icon-theme"
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -546,11 +546,11 @@ registerAction2(class extends Action2 {
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [{
             type: "separator",
-            label: ( localize(13351, "product icon themes"))
+            label: ( localize(14201, "product icon themes"))
         }, {
             id: DEFAULT_PRODUCT_ICON_THEME_ID,
             theme: ProductIconThemeData.defaultTheme,
-            label: ( localize(13352, "Default"))
+            label: ( localize(14202, "Default"))
         }, ...toEntries(await themeService.getProductIconThemes())];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
     }
@@ -617,13 +617,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(13353, "Manage Extension"))
+    tooltip: ( localize(14203, "Manage Extension"))
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.generateColorTheme",
-            title: ( localize2(13354, "Generate Color Theme From Current Settings")),
+            title: ( localize2(14204, "Generate Color Theme From Current Settings")),
             category: Categories.Developer,
             f1: true
         });
@@ -678,7 +678,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(13355, "Toggle between Light/Dark Themes")),
+            title: ( localize2(14205, "Toggle between Light/Dark Themes")),
             category: Categories.Preferences,
             f1: true
         });
@@ -690,12 +690,12 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                13356,
+                14206,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity.Info, message, [{
-                label: ( localize(13357, "Open Settings")),
+                label: ( localize(14207, "Open Settings")),
                 run: () => {
                     return preferencesService.openUserSettings({
                         query: ThemeSettings.DETECT_COLOR_SCHEME
@@ -734,7 +734,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(13358, "Browse Color Themes in Marketplace")),
+            title: ( localize2(14208, "Browse Color Themes in Marketplace")),
             category: Categories.Preferences,
             f1: true
         });
@@ -775,13 +775,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( new MenuId("ThemesSubMenu"));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(13359, "Themes")),
+    title: ( localize(14209, "Themes")),
     submenu: ThemesSubMenu,
     group: "2_configuration",
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(13360, "&&Themes")),
+    title: ( localize(14210, "&&Themes")),
     submenu: ThemesSubMenu,
     group: "2_configuration",
     order: 7
@@ -789,21 +789,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(13328, "Color Theme"))
+        title: ( localize(14178, "Color Theme"))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(13361, "File Icon Theme"))
+        title: ( localize(14211, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(13362, "Product Icon Theme"))
+        title: ( localize(14212, "Product Icon Theme"))
     },
     order: 3
 });

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

@@ -0,0 +1,19 @@
+import { IColorTheme, IThemingParticipant } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+/**
+ * Generates CSS content (variables + theming participant rules) for a color theme.
+ * Pure function - no DOM side effects.
+ *
+ * @param theme The color theme to generate CSS for
+ * @param scopeSelector CSS selector to scope the rules (e.g. '.monaco-workbench')
+ * @param themingParticipants Functions that contribute additional CSS rules (optional)
+ * @param environmentService Passed to theming participants (required if themingParticipants is non-empty)
+ */
+export declare function generateColorThemeCSS(theme: IColorTheme, scopeSelector: string, themingParticipants?: readonly IThemingParticipant[], environmentService?: IEnvironmentService): CSSValue;
+/**
+ * A typed wrapper for CSS content
+ */
+export declare class CSSValue {
+    readonly code: string;
+    constructor(code: string);
+}

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

@@ -0,0 +1,53 @@
+
+import { getColorRegistry, asCssVariableName } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+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 { getSizeRegistry, asCssVariableName as asCssVariableName$1, sizeValueToCss } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/sizeUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/sizes/baseSizes';
+
+function generateColorThemeCSS(theme, scopeSelector, themingParticipants, environmentService) {
+    const cssRules = ( new Set());
+    const ruleCollector = {
+        addRule: rule => {
+            if (!( cssRules.has(rule))) {
+                cssRules.add(rule);
+            }
+        }
+    };
+    ruleCollector.addRule(`${scopeSelector} { forced-color-adjust: none; }`);
+    if (themingParticipants && environmentService) {
+        for (const participant of themingParticipants) {
+            participant(theme, ruleCollector, environmentService);
+        }
+    }
+    const variables = [];
+    for (const item of getColorRegistry().getColors()) {
+        const color = theme.getColor(item.id, true);
+        if (color) {
+            variables.push(`${asCssVariableName(item.id)}: ${( color.toString())};`);
+        }
+    }
+    for (const item of getSizeRegistry().getSizes()) {
+        const sizeValue = getSizeRegistry().resolveDefaultSize(item.id, theme);
+        if (sizeValue) {
+            variables.push(`${asCssVariableName$1(item.id)}: ${sizeValueToCss(sizeValue)};`);
+        }
+    }
+    ruleCollector.addRule(`${scopeSelector} { ${variables.join("\n")} }`);
+    return ( new CSSValue([...cssRules].join("\n")));
+}
+class CSSValue {
+    constructor(code) {
+        this.code = code;
+    }
+}
+
+export { CSSValue, generateColorThemeCSS };

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

@@ -149,12 +149,12 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( new Error(( localize(
-                    14904,
+                    15831,
                     "Problems parsing file icons file: {0}",
                     ( errors.map(e => getParseErrorMessage(e.error))).join(", ")
                 )))));
             } else if (getNodeType(contentValue) !== "object") {
-                return Promise.reject(( new Error(( localize(14905, "Invalid format for file icons theme file: Object expected.")))));
+                return Promise.reject(( new Error(( localize(15832, "Invalid format for file icons theme file: Object expected.")))));
             }
             return Promise.resolve(contentValue);
         });

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

@@ -43,7 +43,7 @@ class ProductIconThemeData {
         this.isLoaded = true;
         if (warnings.length) {
             logService.error(( localize(
-                14906,
+                15833,
                 "Problems processing product icons definitions in {0}:\n{1}",
                 (location.toString()),
                 warnings.join("\n")
@@ -76,7 +76,7 @@ class ProductIconThemeData {
     static get defaultTheme() {
         let themeData = ProductIconThemeData._defaultProductIconTheme;
         if (!themeData) {
-            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(14907, "Default")), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(15834, "Default")), ThemeSettingDefaults.PRODUCT_ICON_THEME));
             themeData.isLoaded = true;
             themeData.extensionData = undefined;
             themeData.watch = false;
@@ -187,15 +187,15 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
         const contentValue = parse(content, parseErrors);
         if (parseErrors.length > 0) {
             return Promise.reject(( new Error(( localize(
-                14908,
+                15835,
                 "Problems parsing product icons file: {0}",
                 ( parseErrors.map(e => getParseErrorMessage(e.error))).join(", ")
             )))));
         } else if (getNodeType(contentValue) !== "object") {
-            return Promise.reject(( new Error(( localize(14909, "Invalid format for product icons theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(15836, "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(
-                14910,
+                15837,
                 "Invalid format for product icons theme file: Must contain iconDefinitions and fonts."
             )))));
         }
@@ -208,13 +208,13 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                 if (isString(font.weight) && font.weight.match(fontWeightRegex)) {
                     fontWeight = font.weight;
                 } else {
-                    warnings.push(( localize(14911, "Invalid font weight in font '{0}'. Ignoring setting.", font.id)));
+                    warnings.push(( localize(15838, "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(14912, "Invalid font style in font '{0}'. Ignoring setting.", font.id)));
+                    warnings.push(( localize(15839, "Invalid font style in font '{0}'. Ignoring setting.", font.id)));
                 }
                 const sanitizedSrc = [];
                 if (Array.isArray(font.src)) {
@@ -226,7 +226,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                                 format: s.format
                             });
                         } else {
-                            warnings.push(( localize(14913, "Invalid font source in font '{0}'. Ignoring source.", font.id)));
+                            warnings.push(( localize(15840, "Invalid font source in font '{0}'. Ignoring source.", font.id)));
                         }
                     }
                 }
@@ -238,14 +238,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     });
                 } else {
                     warnings.push(( localize(
-                        14914,
+                        15841,
                         "No valid font source in font '{0}'. Ignoring font definition.",
                         font.id
                     )));
                 }
             } else {
                 warnings.push(( localize(
-                    14915,
+                    15842,
                     "Missing or invalid font id '{0}'. Skipping font definition.",
                     font.id
                 )));
@@ -268,10 +268,10 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                         font
                     });
                 } else {
-                    warnings.push(( localize(14916, "Skipping icon definition '{0}'. Unknown font.", iconId)));
+                    warnings.push(( localize(15843, "Skipping icon definition '{0}'. Unknown font.", iconId)));
                 }
             } else {
-                warnings.push(( localize(14917, "Skipping icon definition '{0}': Needs to be defined", iconId)));
+                warnings.push(( localize(15844, "Skipping icon definition '{0}': Needs to be defined", iconId)));
             }
         }
         return {

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

@@ -38,7 +38,7 @@ import { IHostColorSchemeService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { Sequencer, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IUserDataInitializationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service';
 import { getIconsStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/iconsStyleSheet';
-import { getColorRegistry, asCssVariableName } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import { getColorRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
@@ -49,10 +49,9 @@ 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 { getSizeRegistry, asCssVariableName as asCssVariableName$1, sizeValueToCss } from '../../../../platform/theme/common/sizeUtils.js';
-import '../../../../platform/theme/common/sizes/baseSizes.js';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+import { generateColorThemeCSS } from './colorThemeCss.js';
 
 const defaultThemeExtensionId = "vscode-theme-defaults";
 const DEFAULT_FILE_ICON_THEME_ID = "vscode.vscode-theme-seti-vs-seti";
@@ -107,9 +106,9 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         this.settings = ( new ThemeConfiguration(configurationService, hostColorService));
         this.colorThemeRegistry = this._register(( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme)));
         this.colorThemeWatcher = this._register(( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this))));
-        this.onColorThemeChange = ( new Emitter({
+        this.onColorThemeChange = this._register(( new Emitter({
             leakWarningThreshold: 400
-        }));
+        })));
         this.currentColorTheme = ColorThemeData.createUnloadedTheme("");
         this.colorThemeSequencer = ( new Sequencer());
         this.fileIconThemeWatcher = this._register(( new ThemeFileWatcher(
@@ -124,9 +123,9 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             FileIconThemeData.noIconTheme
         )));
         this.fileIconThemeLoader = ( new FileIconThemeLoader(extensionResourceLoaderService, languageService));
-        this.onFileIconThemeChange = ( new Emitter({
+        this.onFileIconThemeChange = this._register(( new Emitter({
             leakWarningThreshold: 400
-        }));
+        })));
         this.currentFileIconTheme = FileIconThemeData.createUnloadedTheme("");
         this.fileIconThemeSequencer = ( new Sequencer());
         this.productIconThemeWatcher = this._register(( new ThemeFileWatcher(
@@ -140,7 +139,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             true,
             ProductIconThemeData.defaultTheme
         )));
-        this.onProductIconThemeChange = ( new Emitter());
+        this.onProductIconThemeChange = this._register(( new Emitter()));
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme("");
         this.productIconThemeSequencer = ( new Sequencer());
         this._register(
@@ -394,7 +393,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             return this.applyTheme(themeData, settingsTarget);
         } catch (error) {
             throw ( new Error(( localize(
-                14918,
+                15845,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message
@@ -431,34 +430,13 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         });
     }
     updateDynamicCSSRules(themeData) {
-        const cssRules = ( new Set());
-        const ruleCollector = {
-            addRule: rule => {
-                if (!( cssRules.has(rule))) {
-                    cssRules.add(rule);
-                }
-            }
-        };
-        ruleCollector.addRule(`.monaco-workbench { forced-color-adjust: none; }`);
-        themingRegistry.getThemingParticipants().forEach(p => p(themeData, ruleCollector, this.environmentService));
-        const colorVariables = [];
-        for (const item of getColorRegistry().getColors()) {
-            const color = themeData.getColor(item.id, true);
-            if (color) {
-                colorVariables.push(`${asCssVariableName(item.id)}: ${( color.toString())};`);
-            }
-        }
-        const sizeVariables = [];
-        for (const item of getSizeRegistry().getSizes()) {
-            const sizeValue = getSizeRegistry().resolveDefaultSize(item.id, themeData);
-            if (sizeValue) {
-                sizeVariables.push(`${asCssVariableName$1(item.id)}: ${sizeValueToCss(sizeValue)};`);
-            }
-        }
-        ruleCollector.addRule(
-            `.monaco-workbench { ${(colorVariables.concat(sizeVariables)).join("\n")} }`
+        const css = generateColorThemeCSS(
+            themeData,
+            ".monaco-workbench",
+            themingRegistry.getThemingParticipants(),
+            this.environmentService
         );
-        _applyRules([...cssRules].join("\n"), colorThemeRulesClassName);
+        _applyRules(css.code, colorThemeRulesClassName);
     }
     applyTheme(newTheme, settingsTarget, silent = false) {
         this.updateDynamicCSSRules(newTheme);