@codingame/monaco-vscode-theme-service-override 28.4.0 → 29.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "28.4.0",
+  "version": "29.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": "28.4.0",
-    "@codingame/monaco-vscode-files-service-override": "28.4.0"
+    "@codingame/monaco-vscode-api": "29.0.0",
+    "@codingame/monaco-vscode-files-service-override": "29.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -6,7 +6,7 @@ import { registerAction2, Action2, MenuId, MenuRegistry } from '@codingame/monac
 import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
-import { ThemeSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettings, ThemeSettingDefaults } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { IWorkbenchThemeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IExtensionGalleryService, IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
@@ -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(14369, "Icon for the 'Manage' action in the theme selection quick pick.")));
+const manageExtensionIcon = registerIcon("theme-selection-manage-extension", Codicon.gear, ( localize(14631, "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(14370, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(14632, "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(14371, "Error while searching for themes: {0}", this._searchError))}`,
+                        label: `$(error) ${( localize(14633, "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(
-                14372,
+                14634,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(14373, "OK"))
+            primaryButton: ( localize(14635, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -267,7 +267,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(14374, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(14636, "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(14375, "Color Theme")),
+            title: ( localize2(14637, "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(14376, "Select Color Theme for System Dark Mode");
+            return localize(14638, "Select Color Theme for System Dark Mode");
         case ColorScheme.LIGHT:
-            return localize(14377, "Select Color Theme for System Light Mode");
+            return localize(14639, "Select Color Theme for System Light Mode");
         case ColorScheme.HIGH_CONTRAST_DARK:
-            return localize(14378, "Select Color Theme for High Contrast Dark Mode");
+            return localize(14640, "Select Color Theme for High Contrast Dark Mode");
         case ColorScheme.HIGH_CONTRAST_LIGHT:
-            return localize(14379, "Select Color Theme for High Contrast Light Mode");
+            return localize(14641, "Select Color Theme for High Contrast Light Mode");
         default:
-            return localize(14380, "Select Color Theme (detect system color mode disabled)");
+            return localize(14642, "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(14381, "Detect system color mode enabled. Click to configure.")) : ( localize(14382, "Detect system color mode disabled. Click to configure.")),
+            tooltip: preferredColorScheme ? ( localize(14643, "Detect system color mode enabled. Click to configure.")) : ( localize(14644, "Detect system color mode disabled. Click to configure.")),
             iconClass: ThemeIcon.asClassName(Codicon.colorMode),
             location: QuickInputButtonLocation.Inline
         };
         const options = {
-            installMessage: ( localize(14383, "Install Additional Color Themes...")),
-            browseMessage: "$(plus) " + ( localize(14384, "Browse Additional Color Themes...")),
+            installMessage: ( localize(14645, "Install Additional Color Themes...")),
+            browseMessage: "$(plus) " + ( localize(14646, "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(14385, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(14386, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(14387, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(14647, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(14648, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(14649, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
         case ColorScheme.DARK:
@@ -494,7 +494,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(14388, "File Icon Theme")),
+            title: ( localize2(14650, "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(14389, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(14390, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(14651, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(14652, "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(14391, "file icon themes"))
+            label: ( localize(14653, "file icon themes"))
         }, {
             id: "",
             theme: FileIconThemeData.noIconTheme,
-            label: ( localize(14392, "None")),
-            description: ( localize(14393, "Disable File Icons"))
+            label: ( localize(14654, "None")),
+            description: ( localize(14655, "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(14394, "Product Icon Theme")),
+            title: ( localize2(14656, "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(14395, "Install Additional Product Icon Themes...")),
-            browseMessage: "$(plus) " + ( localize(14396, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(14397, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(14657, "Install Additional Product Icon Themes...")),
+            browseMessage: "$(plus) " + ( localize(14658, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(14659, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: "tag:product-icon-theme"
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -546,15 +546,92 @@ registerAction2(class extends Action2 {
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [{
             type: "separator",
-            label: ( localize(14398, "product icon themes"))
+            label: ( localize(14660, "product icon themes"))
         }, {
             id: DEFAULT_PRODUCT_ICON_THEME_ID,
             theme: ProductIconThemeData.defaultTheme,
-            label: ( localize(14399, "Default"))
+            label: ( localize(14661, "Default"))
         }, ...toEntries(await themeService.getProductIconThemes())];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.tryNewDefaultThemes",
+            title: ( localize2(14662, "Try New Default Themes")),
+            category: Categories.Preferences,
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const themeService = accessor.get(IWorkbenchThemeService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const configurationService = accessor.get(IConfigurationService);
+        const previousTheme = themeService.getColorTheme();
+        const allThemes = await themeService.getColorThemes();
+        const newThemeSettingsIds = ( new Set([
+            ThemeSettingDefaults.COLOR_THEME_LIGHT,
+            ThemeSettingDefaults.COLOR_THEME_DARK
+        ]));
+        const themes = allThemes.filter(t => ( newThemeSettingsIds.has(t.settingsId)));
+        const items = ( themes.map(t => ({
+            id: t.id,
+            label: t.label,
+            description: t.description
+        })));
+        const disposables = ( new DisposableStore());
+        const picker = disposables.add(quickInputService.createQuickPick());
+        picker.items = items;
+        picker.placeholder = ( localize(14663, "Pick a new default theme"));
+        picker.canSelectMany = false;
+        const preferredId = (previousTheme.type === ColorScheme.LIGHT || previousTheme.type === ColorScheme.HIGH_CONTRAST_LIGHT) ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
+        const activeItem = items.find(i => themes.find(t => t.id === i.id)?.settingsId === preferredId);
+        if (activeItem) {
+            picker.activeItems = [activeItem];
+        }
+        disposables.add(picker.onDidChangeActive(selected => {
+            if (selected[0]) {
+                const theme = themes.find(t => t.id === selected[0].id);
+                if (theme) {
+                    themeService.setColorTheme(theme, "preview");
+                }
+            }
+        }));
+        disposables.add(picker.onDidAccept(() => {
+            const selected = picker.activeItems[0];
+            const theme = selected ? themes.find(t => t.id === selected.id) : undefined;
+            picker.hide();
+            if (!theme) {
+                return;
+            }
+            (async () => {
+                try {
+                    await themeService.setColorTheme(theme, "auto");
+                    await configurationService.updateValue(
+                        ThemeSettings.PREFERRED_LIGHT_THEME,
+                        ThemeSettingDefaults.COLOR_THEME_LIGHT
+                    );
+                    await configurationService.updateValue(ThemeSettings.PREFERRED_DARK_THEME, ThemeSettingDefaults.COLOR_THEME_DARK);
+                } catch (error) {
+                    if (!isCancellationError(error)) {
+                        onUnexpectedError(error);
+                    }
+                }
+            })();
+        }));
+        const result = ( new Promise(resolve => {
+            disposables.add(picker.onDidHide(() => {
+                if (!picker.selectedItems.length) {
+                    themeService.setColorTheme(previousTheme, undefined);
+                }
+                resolve();
+            }));
+        })).finally(() => disposables.dispose());
+        picker.show();
+        return result;
+    }
+});
 CommandsRegistry.registerCommand(
     "workbench.action.previewColorTheme",
     async function(accessor, extension, themeSettingsId) {
@@ -591,13 +668,17 @@ function configurationEntry(label, configureItem) {
 function isItem(i) {
     return i["type"] !== "separator";
 }
+const defaultThemeDescriptions = {
+    [ThemeSettingDefaults.COLOR_THEME_LIGHT]: ( localize(14664, "Default Light")),
+    [ThemeSettingDefaults.COLOR_THEME_DARK]: ( localize(14665, "Default Dark"))
+};
 function toEntry(theme) {
     const settingId = theme.settingsId ?? undefined;
     const item = {
         id: theme.id,
         theme: theme,
         label: theme.label,
-        description: theme.description || (theme.label === settingId ? undefined : settingId)
+        description: defaultThemeDescriptions[settingId ?? ""] ?? theme.description ?? (theme.label === settingId ? undefined : settingId)
     };
     if (theme.extensionData) {
         item.buttons = [configureButton];
@@ -605,7 +686,18 @@ function toEntry(theme) {
     return item;
 }
 function toEntries(themes, label) {
-    const sorter = (t1, t2) => t1.label.localeCompare(t2.label);
+    const pinnedIds = ( new Set([
+        ThemeSettingDefaults.COLOR_THEME_DARK,
+        ThemeSettingDefaults.COLOR_THEME_LIGHT
+    ]));
+    const sorter = (t1, t2) => {
+        const pin1 = ( pinnedIds.has(t1.theme?.settingsId ?? ""));
+        const pin2 = ( pinnedIds.has(t2.theme?.settingsId ?? ""));
+        if (pin1 !== pin2) {
+            return pin1 ? -1 : 1;
+        }
+        return t1.label.localeCompare(t2.label);
+    };
     const entries = ( themes.map(toEntry)).sort(sorter);
     if (entries.length > 0 && label) {
         entries.unshift({
@@ -617,13 +709,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(14400, "Manage Extension"))
+    tooltip: ( localize(14666, "Manage Extension"))
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.generateColorTheme",
-            title: ( localize2(14401, "Generate Color Theme From Current Settings")),
+            title: ( localize2(14667, "Generate Color Theme From Current Settings")),
             category: Categories.Developer,
             f1: true
         });
@@ -678,7 +770,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(14402, "Toggle between Light/Dark Themes")),
+            title: ( localize2(14668, "Toggle between Light/Dark Themes")),
             category: Categories.Preferences,
             f1: true
         });
@@ -690,12 +782,12 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                14403,
+                14669,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity.Info, message, [{
-                label: ( localize(14404, "Open Settings")),
+                label: ( localize(14670, "Open Settings")),
                 run: () => {
                     return preferencesService.openUserSettings({
                         query: ThemeSettings.DETECT_COLOR_SCHEME
@@ -734,7 +826,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(14405, "Browse Color Themes in Marketplace")),
+            title: ( localize2(14671, "Browse Color Themes in Marketplace")),
             category: Categories.Preferences,
             f1: true
         });
@@ -775,13 +867,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( new MenuId("ThemesSubMenu"));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(14406, "Themes")),
+    title: ( localize(14672, "Themes")),
     submenu: ThemesSubMenu,
     group: "2_configuration",
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(14407, "&&Themes")),
+    title: ( localize(14673, "&&Themes")),
     submenu: ThemesSubMenu,
     group: "2_configuration",
     order: 7
@@ -789,21 +881,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(14375, "Color Theme"))
+        title: ( localize(14637, "Color Theme"))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(14408, "File Icon Theme"))
+        title: ( localize(14674, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(14409, "Product Icon Theme"))
+        title: ( localize(14675, "Product Icon Theme"))
     },
     order: 3
 });

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(
-                    16029,
+                    16325,
                     "Problems parsing file icons file: {0}",
                     ( errors.map(e => getParseErrorMessage(e.error))).join(", ")
                 )))));
             } else if (getNodeType(contentValue) !== "object") {
-                return Promise.reject(( new Error(( localize(16030, "Invalid format for file icons theme file: Object expected.")))));
+                return Promise.reject(( new Error(( localize(16326, "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(
-                16031,
+                16327,
                 "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(16032, "Default")), ThemeSettingDefaults.PRODUCT_ICON_THEME));
+            themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(16328, "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(
-                16033,
+                16329,
                 "Problems parsing product icons file: {0}",
                 ( parseErrors.map(e => getParseErrorMessage(e.error))).join(", ")
             )))));
         } else if (getNodeType(contentValue) !== "object") {
-            return Promise.reject(( new Error(( localize(16034, "Invalid format for product icons theme file: Object expected.")))));
+            return Promise.reject(( new Error(( localize(16330, "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(
-                16035,
+                16331,
                 "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(16036, "Invalid font weight in font '{0}'. Ignoring setting.", font.id)));
+                    warnings.push(( localize(16332, "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(16037, "Invalid font style in font '{0}'. Ignoring setting.", font.id)));
+                    warnings.push(( localize(16333, "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(16038, "Invalid font source in font '{0}'. Ignoring source.", font.id)));
+                            warnings.push(( localize(16334, "Invalid font source in font '{0}'. Ignoring source.", font.id)));
                         }
                     }
                 }
@@ -238,14 +238,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
                     });
                 } else {
                     warnings.push(( localize(
-                        16039,
+                        16335,
                         "No valid font source in font '{0}'. Ignoring font definition.",
                         font.id
                     )));
                 }
             } else {
                 warnings.push(( localize(
-                    16040,
+                    16336,
                     "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(16041, "Skipping icon definition '{0}'. Unknown font.", iconId)));
+                    warnings.push(( localize(16337, "Skipping icon definition '{0}'. Unknown font.", iconId)));
                 }
             } else {
-                warnings.push(( localize(16042, "Skipping icon definition '{0}': Needs to be defined", iconId)));
+                warnings.push(( localize(16338, "Skipping icon definition '{0}': Needs to be defined", iconId)));
             }
         }
         return {

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

@@ -17,6 +17,8 @@ import { ColorScheme } from "@codingame/monaco-vscode-api/vscode/vs/platform/the
 import { IHostColorSchemeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/hostColorSchemeService.service";
 import { IUserDataInitializationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class WorkbenchThemeService extends Disposable implements IWorkbenchThemeService {
     private readonly storageService;
     private readonly configurationService;
@@ -27,6 +29,8 @@ export declare class WorkbenchThemeService extends Disposable implements IWorkbe
     private readonly hostColorService;
     private readonly userDataInitializationService;
     private readonly languageService;
+    private readonly notificationService;
+    private readonly commandService;
     readonly _serviceBrand: undefined;
     private readonly container;
     private settings;
@@ -47,8 +51,20 @@ export declare class WorkbenchThemeService extends Disposable implements IWorkbe
     private readonly onProductIconThemeChange;
     private readonly productIconThemeWatcher;
     private readonly productIconThemeSequencer;
-    constructor(extensionService: IExtensionService, storageService: IStorageService, configurationService: IConfigurationService, telemetryService: ITelemetryService, environmentService: IBrowserWorkbenchEnvironmentService, fileService: IFileService, extensionResourceLoaderService: IExtensionResourceLoaderService, layoutService: IWorkbenchLayoutService, logService: ILogService, hostColorService: IHostColorSchemeService, userDataInitializationService: IUserDataInitializationService, languageService: ILanguageService);
+    constructor(extensionService: IExtensionService, storageService: IStorageService, configurationService: IConfigurationService, telemetryService: ITelemetryService, environmentService: IBrowserWorkbenchEnvironmentService, fileService: IFileService, extensionResourceLoaderService: IExtensionResourceLoaderService, layoutService: IWorkbenchLayoutService, logService: ILogService, hostColorService: IHostColorSchemeService, userDataInitializationService: IUserDataInitializationService, languageService: ILanguageService, notificationService: INotificationService, commandService: ICommandService);
     private initialize;
+    private static readonly NEW_THEME_NOTIFICATION_KEY;
+    private showNewDefaultThemeNotification;
+    /**
+     * Migrates legacy theme setting values to their current equivalents,
+     * writing back the migrated value so settings sync distributes the correct ID.
+     */
+    private migrateColorThemeSettings;
+    /**
+     * For new users who haven't explicitly configured `window.autoDetectColorScheme`,
+     * persist `true` so that auto-detect becomes the default going forward.
+     */
+    private migrateAutoDetectColorScheme;
     private installConfigurationListener;
     private installRegistryListeners;
     private installPreferredSchemeListener;