@codingame/monaco-vscode-theme-service-override 29.1.0 → 30.0.0

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isUndefined, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { ThemeSettingDefaults, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS, ThemeSettings, migrateThemeSettingsId, ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettingDefaults, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS, migrateThemeSettingsId, ThemeSettings, ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -14,7 +14,7 @@ import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ColorThemeData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/colorThemeData';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
@@ -55,7 +55,8 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { generateColorThemeCSS } from './colorThemeCss.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 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';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 var WorkbenchThemeService_1;
@@ -100,7 +101,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         userDataInitializationService,
         languageService,
         notificationService,
-        commandService
+        hostService
     ) {
         super();
         this.storageService = storageService;
@@ -113,11 +114,10 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         this.userDataInitializationService = userDataInitializationService;
         this.languageService = languageService;
         this.notificationService = notificationService;
-        this.commandService = commandService;
+        this.hostService = hostService;
         this.themeExtensionsActivated = ( new Map());
         this.container = layoutService.mainContainer;
-        const isNewUser = this.storageService.isNew(StorageScope.APPLICATION);
-        this.settings = ( new ThemeConfiguration(configurationService, hostColorService, isNewUser));
+        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 = this._register(( new Emitter({
@@ -160,6 +160,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             this.onDidColorThemeChange(theme => getColorRegistry().notifyThemeUpdate(theme))
         );
         let themeData = ColorThemeData.fromStorageData(this.storageService);
+        const previousColorThemeSetting = themeData?.settingsId;
         const colorThemeSetting = this.settings.colorTheme;
         if (themeData && colorThemeSetting !== themeData.settingsId) {
             themeData = undefined;
@@ -189,7 +190,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             this.installConfigurationListener();
             this.installPreferredSchemeListener();
             this.installRegistryListeners();
-            this.initialize().catch(onUnexpectedError);
+            this.initialize(previousColorThemeSetting).catch(onUnexpectedError);
         });
         const codiconStyleSheet = createStyleSheet();
         codiconStyleSheet.id = "codiconStyles";
@@ -201,7 +202,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         this._register(iconsStyleSheet.onDidChange(() => delayer.schedule()));
         delayer.schedule();
     }
-    async initialize() {
+    async initialize(themePreviousSettingsId) {
         const extDevLocs = this.environmentService.extensionDevelopmentLocationURI;
         const extDevLoc = extDevLocs && extDevLocs.length === 1 ? extDevLocs[0] : undefined;
         const initializeColorTheme = async () => {
@@ -243,44 +244,72 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             return this.setProductIconTheme(theme ? theme.id : DEFAULT_PRODUCT_ICON_THEME_ID, undefined);
         };
         this.migrateColorThemeSettings();
-        await this.migrateAutoDetectColorScheme();
         const result = await Promise.all([
             initializeColorTheme(),
             initializeFileIconTheme(),
             initializeProductIconTheme()
         ]);
-        this.showNewDefaultThemeNotification();
+        await this.showNewDefaultThemeNotification(themePreviousSettingsId);
         return result;
     }
     static {
         this.NEW_THEME_NOTIFICATION_KEY = "workbench.newDefaultThemeNotification";
     }
-    showNewDefaultThemeNotification() {
-        const newDefaultThemes = ( new Set([
-            ThemeSettingDefaults.COLOR_THEME_DARK,
-            ThemeSettingDefaults.COLOR_THEME_LIGHT
-        ]));
-        if (( newDefaultThemes.has(this.currentColorTheme.settingsId))) {
-            return;
-        }
+    async showNewDefaultThemeNotification(previousSettingsId) {
         if (this.storageService.getBoolean(
             WorkbenchThemeService_1.NEW_THEME_NOTIFICATION_KEY,
             StorageScope.APPLICATION
         )) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Info, ( localize(16339, "New default themes are available for VS Code.")), [{
-            label: ( localize(16340, "Try Them Out")),
-            run: () => this.commandService.executeCommand("workbench.action.tryNewDefaultThemes")
-        }]);
-        this._register(Event.once(handle.onDidClose)(() => {
+        if (!(await this.hostService.hadLastFocus()) || this.environmentService.isSessionsWindow) {
+            return;
+        }
+        try {
+            if (!this.settings.isDefaultColorTheme() || !previousSettingsId) {
+                return;
+            }
+            previousSettingsId = migrateThemeSettingsId(previousSettingsId);
+            if (!["Dark Modern", "Light Modern"].includes(previousSettingsId)) {
+                return;
+            }
+            if (![
+                ThemeSettingDefaults.COLOR_THEME_DARK,
+                ThemeSettingDefaults.COLOR_THEME_LIGHT
+            ].includes(this.settings.colorTheme)) {
+                return;
+            }
+        } finally {
             this.storageService.store(
                 WorkbenchThemeService_1.NEW_THEME_NOTIFICATION_KEY,
                 true,
                 StorageScope.APPLICATION,
                 StorageTarget.USER
             );
+        }
+        const keepTheme = await ( new Promise(resolve => {
+            this.notificationService.prompt(Severity.Info, ( localize(
+                16425,
+                "VS Code has a new default theme: '{0}'.",
+                this.getColorTheme().label
+            )), [toAction({
+                id: "themeUpdated.tryItOut",
+                label: ( localize(16426, "Keep It")),
+                run: () => resolve(true)
+            }), toAction({
+                id: "themeUpdated.noThanks",
+                label: ( localize(16427, "No Thanks")),
+                run: () => resolve(false)
+            })], {
+                onCancel: () => resolve(false)
+            });
         }));
+        if (!keepTheme) {
+            const previousTheme = this.colorThemeRegistry.findThemeBySettingsId(previousSettingsId);
+            if (previousTheme) {
+                this.setColorTheme(previousTheme.id, "auto");
+            }
+        }
     }
     migrateColorThemeSettings() {
         const themeSettings = [
@@ -306,16 +335,6 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             }
         }
     }
-    async migrateAutoDetectColorScheme() {
-        if (!this.storageService.isNew(StorageScope.APPLICATION)) {
-            return;
-        }
-        await this.userDataInitializationService.whenInitializationFinished();
-        const inspection = this.configurationService.inspect(ThemeSettings.DETECT_COLOR_SCHEME);
-        if (inspection.userValue === undefined && inspection.userLocalValue === undefined && inspection.userRemoteValue === undefined) {
-            await this.configurationService.updateValue(ThemeSettings.DETECT_COLOR_SCHEME, true, ConfigurationTarget.USER);
-        }
-    }
     installConfigurationListener() {
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(ThemeSettings.COLOR_THEME) || e.affectsConfiguration(ThemeSettings.PREFERRED_DARK_THEME) || e.affectsConfiguration(ThemeSettings.PREFERRED_LIGHT_THEME) || e.affectsConfiguration(ThemeSettings.PREFERRED_HC_DARK_THEME) || e.affectsConfiguration(ThemeSettings.PREFERRED_HC_LIGHT_THEME) || e.affectsConfiguration(ThemeSettings.DETECT_COLOR_SCHEME) || e.affectsConfiguration(ThemeSettings.DETECT_HC) || e.affectsConfiguration(ThemeSettings.SYSTEM_COLOR_THEME)) {
@@ -475,7 +494,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
             return this.applyTheme(themeData, settingsTarget);
         } catch (error) {
             throw ( new Error(( localize(
-                16341,
+                16428,
                 "Unable to load {0}: {1}",
                 themeData.location?.toString(),
                 error.message
@@ -750,7 +769,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         }
     }
 };
-WorkbenchThemeService = WorkbenchThemeService_1 = ( __decorate([( __param(0, IExtensionService)), ( __param(1, IStorageService)), ( __param(2, IConfigurationService)), ( __param(3, ITelemetryService)), ( __param(4, IBrowserWorkbenchEnvironmentService)), ( __param(5, IFileService)), ( __param(6, IExtensionResourceLoaderService)), ( __param(7, IWorkbenchLayoutService)), ( __param(8, ILogService)), ( __param(9, IHostColorSchemeService)), ( __param(10, IUserDataInitializationService)), ( __param(11, ILanguageService)), ( __param(12, INotificationService)), ( __param(13, ICommandService))], WorkbenchThemeService));
+WorkbenchThemeService = WorkbenchThemeService_1 = ( __decorate([( __param(0, IExtensionService)), ( __param(1, IStorageService)), ( __param(2, IConfigurationService)), ( __param(3, ITelemetryService)), ( __param(4, IBrowserWorkbenchEnvironmentService)), ( __param(5, IFileService)), ( __param(6, IExtensionResourceLoaderService)), ( __param(7, IWorkbenchLayoutService)), ( __param(8, ILogService)), ( __param(9, IHostColorSchemeService)), ( __param(10, IUserDataInitializationService)), ( __param(11, ILanguageService)), ( __param(12, INotificationService)), ( __param(13, IHostService))], WorkbenchThemeService));
 class ThemeFileWatcher {
     constructor(fileService, environmentService, onUpdate) {
         this.fileService = fileService;

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

@@ -133,31 +133,31 @@ const textmateColorSchema = {
         },
         settings: {
             type: "object",
-            description: ( localize(16372, "Colors and styles for the token.")),
+            description: ( localize(16459, "Colors and styles for the token.")),
             properties: {
                 foreground: {
                     type: "string",
-                    description: ( localize(16373, "Foreground color for the token.")),
+                    description: ( localize(16460, "Foreground color for the token.")),
                     format: "color-hex",
                     default: "#ff0000"
                 },
                 background: {
                     type: "string",
-                    deprecationMessage: ( localize(16374, "Token background colors are currently not supported."))
+                    deprecationMessage: ( localize(16461, "Token background colors are currently not supported."))
                 },
                 fontStyle: {
                     type: "string",
                     description: ( localize(
-                        16375,
+                        16462,
                         "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(
-                        16376,
+                        16463,
                         "Font style must be 'italic', 'bold', 'underline', 'strikethrough' or a combination or the empty string."
                     )),
                     defaultSnippets: [{
-                        label: ( localize(16377, "None (clear inherited style)")),
+                        label: ( localize(16464, "None (clear inherited style)")),
                         bodyText: "\"\""
                     }, {
                         body: "italic"
@@ -194,21 +194,21 @@ const textmateColorSchema = {
                 fontFamily: {
                     type: "string",
                     description: ( localize(
-                        16378,
+                        16465,
                         "Font family for the token (e.g., \"Fira Code\", \"JetBrains Mono\")."
                     ))
                 },
                 fontSize: {
                     type: "number",
                     description: ( localize(
-                        16379,
+                        16466,
                         "Font size multiplier for the token (e.g., 1.2 will use 1.2 times the default font size)."
                     ))
                 },
                 lineHeight: {
                     type: "number",
                     description: ( localize(
-                        16380,
+                        16467,
                         "Line height multiplier for the token (e.g., 1.2 will use 1.2 times the default height). If the font size is set and the line height is not explicitly set, the line height will be computed based on the font size."
                     ))
                 }
@@ -235,10 +235,10 @@ const textmateColorSchema = {
         properties: {
             name: {
                 type: "string",
-                description: ( localize(16381, "Description of the rule."))
+                description: ( localize(16468, "Description of the rule."))
             },
             scope: {
-                description: ( localize(16382, "Scope selector against which this rule matches.")),
+                description: ( localize(16469, "Scope selector against which this rule matches.")),
                 anyOf: [{
                     enum: textMateScopes
                 }, {
@@ -270,26 +270,26 @@ const colorThemeSchema = {
     allowTrailingCommas: true,
     properties: {
         colors: {
-            description: ( localize(16383, "Colors in the workbench")),
+            description: ( localize(16470, "Colors in the workbench")),
             $ref: workbenchColorsSchemaId,
             additionalProperties: false
         },
         tokenColors: {
             anyOf: [{
                 type: "string",
-                description: ( localize(16384, "Path to a tmTheme file (relative to the current file)."))
+                description: ( localize(16471, "Path to a tmTheme file (relative to the current file)."))
             }, {
-                description: ( localize(16385, "Colors for syntax highlighting")),
+                description: ( localize(16472, "Colors for syntax highlighting")),
                 $ref: textmateColorsSchemaId
             }]
         },
         semanticHighlighting: {
             type: "boolean",
-            description: ( localize(16386, "Whether semantic highlighting should be enabled for this theme."))
+            description: ( localize(16473, "Whether semantic highlighting should be enabled for this theme."))
         },
         semanticTokenColors: {
             type: "object",
-            description: ( localize(16387, "Colors for semantic tokens")),
+            description: ( localize(16474, "Colors for semantic tokens")),
             $ref: tokenStylingSchemaId
         }
     }

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

@@ -13,113 +13,113 @@ const schema = {
         folderExpanded: {
             type: "string",
             description: ( localize(
-                16388,
+                16475,
                 "The folder icon for expanded folders. The expanded folder icon is optional. If not set, the icon defined for folder will be shown."
             ))
         },
         folder: {
             type: "string",
             description: ( localize(
-                16389,
+                16476,
                 "The folder icon for collapsed folders, and if folderExpanded is not set, also for expanded folders."
             ))
         },
         file: {
             type: "string",
             description: ( localize(
-                16390,
+                16477,
                 "The default file icon, shown for all files that don't match any extension, filename or language id."
             ))
         },
         rootFolder: {
             type: "string",
             description: ( localize(
-                16391,
+                16478,
                 "The folder icon for collapsed root folders, and if rootFolderExpanded is not set, also for expanded root folders."
             ))
         },
         rootFolderExpanded: {
             type: "string",
             description: ( localize(
-                16392,
+                16479,
                 "The folder icon for expanded root folders. The expanded root folder icon is optional. If not set, the icon defined for root folder will be shown."
             ))
         },
         rootFolderNames: {
             type: "object",
             description: ( localize(
-                16393,
+                16480,
                 "Associates root folder names to icons. The object key is the root folder name. No patterns or wildcards are allowed. Root folder name matching is case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16394, "The ID of the icon definition for the association."))
+                description: ( localize(16481, "The ID of the icon definition for the association."))
             }
         },
         rootFolderNamesExpanded: {
             type: "object",
             description: ( localize(
-                16395,
+                16482,
                 "Associates root folder names to icons for expanded root folders. The object key is the root folder name. No patterns or wildcards are allowed. Root folder name matching is case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16396, "The ID of the icon definition for the association."))
+                description: ( localize(16483, "The ID of the icon definition for the association."))
             }
         },
         folderNames: {
             type: "object",
             description: ( localize(
-                16397,
+                16484,
                 "Associates folder names to icons. The object key is the folder name, not including any path segments. No patterns or wildcards are allowed. Folder name matching is case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16394, "The ID of the icon definition for the association."))
+                description: ( localize(16481, "The ID of the icon definition for the association."))
             }
         },
         folderNamesExpanded: {
             type: "object",
             description: ( localize(
-                16398,
+                16485,
                 "Associates folder names to icons for expanded folders. The object key is the folder name, not including any path segments. No patterns or wildcards are allowed. Folder name matching is case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16399, "The ID of the icon definition for the association."))
+                description: ( localize(16486, "The ID of the icon definition for the association."))
             }
         },
         fileExtensions: {
             type: "object",
             description: ( localize(
-                16400,
+                16487,
                 "Associates file extensions to icons. The object key is the file extension name. The extension name is the last segment of a file name after the last dot (not including the dot). Extensions are compared case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16401, "The ID of the icon definition for the association."))
+                description: ( localize(16488, "The ID of the icon definition for the association."))
             }
         },
         fileNames: {
             type: "object",
             description: ( localize(
-                16402,
+                16489,
                 "Associates file names to icons. The object key is the full file name, but not including any path segments. File name can include dots and a possible file extension. No patterns or wildcards are allowed. File name matching is case insensitive."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16403, "The ID of the icon definition for the association."))
+                description: ( localize(16490, "The ID of the icon definition for the association."))
             }
         },
         languageIds: {
             type: "object",
             description: ( localize(
-                16404,
+                16491,
                 "Associates languages to icons. The object key is the language id as defined in the language contribution point."
             )),
             additionalProperties: {
                 type: "string",
-                description: ( localize(16405, "The ID of the icon definition for the association."))
+                description: ( localize(16492, "The ID of the icon definition for the association."))
             }
         },
         associations: {
@@ -167,29 +167,29 @@ const schema = {
     properties: {
         fonts: {
             type: "array",
-            description: ( localize(16406, "Fonts that are used in the icon definitions.")),
+            description: ( localize(16493, "Fonts that are used in the icon definitions.")),
             items: {
                 type: "object",
                 properties: {
                     id: {
                         type: "string",
-                        description: ( localize(16407, "The ID of the font.")),
+                        description: ( localize(16494, "The ID of the font.")),
                         pattern: fontIdRegex.source,
                         patternErrorMessage: fontIdErrorMessage
                     },
                     src: {
                         type: "array",
-                        description: ( localize(16408, "The location of the font.")),
+                        description: ( localize(16495, "The location of the font.")),
                         items: {
                             type: "object",
                             properties: {
                                 path: {
                                     type: "string",
-                                    description: ( localize(16409, "The font path, relative to the current file icon theme file."))
+                                    description: ( localize(16496, "The font path, relative to the current file icon theme file."))
                                 },
                                 format: {
                                     type: "string",
-                                    description: ( localize(16410, "The format of the font.")),
+                                    description: ( localize(16497, "The format of the font.")),
                                     enum: ["woff", "woff2", "truetype", "opentype", "embedded-opentype", "svg"]
                                 }
                             },
@@ -199,7 +199,7 @@ const schema = {
                     weight: {
                         type: "string",
                         description: ( localize(
-                            16411,
+                            16498,
                             "The weight of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight for valid values."
                         )),
                         pattern: fontWeightRegex.source
@@ -207,7 +207,7 @@ const schema = {
                     style: {
                         type: "string",
                         description: ( localize(
-                            16412,
+                            16499,
                             "The style of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-style for valid values."
                         )),
                         pattern: fontStyleRegex.source
@@ -215,7 +215,7 @@ const schema = {
                     size: {
                         type: "string",
                         description: ( localize(
-                            16413,
+                            16500,
                             "The default size of the font. We strongly recommend using a percentage value, for example: 125%."
                         )),
                         pattern: fontSizeRegex.source
@@ -227,34 +227,34 @@ const schema = {
         iconDefinitions: {
             type: "object",
             description: ( localize(
-                16414,
+                16501,
                 "Description of all icons that can be used when associating files to icons."
             )),
             additionalProperties: {
                 type: "object",
-                description: ( localize(16415, "An icon definition. The object key is the ID of the definition.")),
+                description: ( localize(16502, "An icon definition. The object key is the ID of the definition.")),
                 properties: {
                     iconPath: {
                         type: "string",
                         description: ( localize(
-                            16416,
+                            16503,
                             "When using a SVG or PNG: The path to the image. The path is relative to the icon set file."
                         ))
                     },
                     fontCharacter: {
                         type: "string",
-                        description: ( localize(16417, "When using a glyph font: The character in the font to use."))
+                        description: ( localize(16504, "When using a glyph font: The character in the font to use."))
                     },
                     fontColor: {
                         type: "string",
                         format: "color-hex",
-                        description: ( localize(16418, "When using a glyph font: The color to use.")),
+                        description: ( localize(16505, "When using a glyph font: The color to use.")),
                         pattern: fontColorRegex.source
                     },
                     fontSize: {
                         type: "string",
                         description: ( localize(
-                            16419,
+                            16506,
                             "When using a font: The font size in percentage to the text font. If not set, defaults to the size in the font definition."
                         )),
                         pattern: fontSizeRegex.source
@@ -262,7 +262,7 @@ const schema = {
                     fontId: {
                         type: "string",
                         description: ( localize(
-                            16420,
+                            16507,
                             "When using a font: The id of the font. If not set, defaults to the first font definition."
                         )),
                         pattern: fontIdRegex.source,
@@ -309,26 +309,26 @@ const schema = {
         },
         light: {
             $ref: "#/definitions/associations",
-            description: ( localize(16421, "Optional associations for file icons in light color themes."))
+            description: ( localize(16508, "Optional associations for file icons in light color themes."))
         },
         highContrast: {
             $ref: "#/definitions/associations",
             description: ( localize(
-                16422,
+                16509,
                 "Optional associations for file icons in high contrast color themes."
             ))
         },
         hidesExplorerArrows: {
             type: "boolean",
             description: ( localize(
-                16423,
+                16510,
                 "Configures whether the file explorer's arrows should be hidden when this theme is active."
             ))
         },
         showLanguageModeIcons: {
             type: "boolean",
             description: ( localize(
-                16424,
+                16511,
                 "Configures whether the default language icons should be used if the theme does not define an icon for a language."
             ))
         }

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

@@ -17,23 +17,23 @@ const schema = {
                 properties: {
                     id: {
                         type: "string",
-                        description: ( localize(16438, "The ID of the font.")),
+                        description: ( localize(16525, "The ID of the font.")),
                         pattern: fontIdRegex.source,
                         patternErrorMessage: fontIdErrorMessage
                     },
                     src: {
                         type: "array",
-                        description: ( localize(16439, "The location of the font.")),
+                        description: ( localize(16526, "The location of the font.")),
                         items: {
                             type: "object",
                             properties: {
                                 path: {
                                     type: "string",
-                                    description: ( localize(16440, "The font path, relative to the current product icon theme file."))
+                                    description: ( localize(16527, "The font path, relative to the current product icon theme file."))
                                 },
                                 format: {
                                     type: "string",
-                                    description: ( localize(16441, "The format of the font.")),
+                                    description: ( localize(16528, "The format of the font.")),
                                     enum: ["woff", "woff2", "truetype", "opentype", "embedded-opentype", "svg"]
                                 }
                             },
@@ -43,7 +43,7 @@ const schema = {
                     weight: {
                         type: "string",
                         description: ( localize(
-                            16442,
+                            16529,
                             "The weight of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight for valid values."
                         )),
                         anyOf: [{
@@ -56,7 +56,7 @@ const schema = {
                     style: {
                         type: "string",
                         description: ( localize(
-                            16443,
+                            16530,
                             "The style of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-style for valid values."
                         )),
                         anyOf: [{
@@ -71,7 +71,7 @@ const schema = {
             }
         },
         iconDefinitions: {
-            description: ( localize(16444, "Association of icon name to a font character.")),
+            description: ( localize(16531, "Association of icon name to a font character.")),
             $ref: iconsSchemaId
         }
     }

package/vscode/src/vs/workbench/services/themes/common/themeConfiguration.d.ts

@@ -11,9 +11,7 @@ export declare function updateProductIconThemeConfigurationSchemas(themes: IWork
 export declare class ThemeConfiguration {
     private configurationService;
     private hostColorService;
-    private readonly isNewUser;
-    constructor(configurationService: IConfigurationService, hostColorService: IHostColorSchemeService, isNewUser?: boolean);
-    private shouldAutoDetectColorScheme;
+    constructor(configurationService: IConfigurationService, hostColorService: IHostColorSchemeService);
     get colorTheme(): string;
     get fileIconTheme(): string | null;
     get productIconTheme(): string;