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

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

@@ -32,7 +32,7 @@ const COLOR_THEME_CONFIGURATION_SETTINGS_TAG = "colorThemeConfiguration";
 const colorThemeSettingSchema = {
     type: "string",
     markdownDescription: ( localize(
-        16147,
+        16445,
         "Specifies the color theme used in the workbench when {0} is not enabled.",
         formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)
     )),
@@ -41,12 +41,12 @@ const colorThemeSettingSchema = {
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
-    errorMessage: ( localize(16148, "Theme is unknown or not installed."))
+    errorMessage: ( localize(16446, "Theme is unknown or not installed."))
 };
 const preferredDarkThemeSettingSchema = {
     type: "string",
     markdownDescription: ( localize(
-        16149,
+        16447,
         "Specifies the color theme when system color mode is dark and {0} is enabled.",
         formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)
     )),
@@ -55,12 +55,12 @@ const preferredDarkThemeSettingSchema = {
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
-    errorMessage: ( localize(16148, "Theme is unknown or not installed."))
+    errorMessage: ( localize(16446, "Theme is unknown or not installed."))
 };
 const preferredLightThemeSettingSchema = {
     type: "string",
     markdownDescription: ( localize(
-        16150,
+        16448,
         "Specifies the color theme when system color mode is light and {0} is enabled.",
         formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)
     )),
@@ -69,12 +69,12 @@ const preferredLightThemeSettingSchema = {
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
-    errorMessage: ( localize(16148, "Theme is unknown or not installed."))
+    errorMessage: ( localize(16446, "Theme is unknown or not installed."))
 };
 const preferredHCDarkThemeSettingSchema = {
     type: "string",
     markdownDescription: ( localize(
-        16151,
+        16449,
         "Specifies the color theme when in high contrast dark mode and {0} is enabled.",
         formatSettingAsLink(ThemeSettings.DETECT_HC)
     )),
@@ -83,12 +83,12 @@ const preferredHCDarkThemeSettingSchema = {
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
-    errorMessage: ( localize(16148, "Theme is unknown or not installed."))
+    errorMessage: ( localize(16446, "Theme is unknown or not installed."))
 };
 const preferredHCLightThemeSettingSchema = {
     type: "string",
     markdownDescription: ( localize(
-        16152,
+        16450,
         "Specifies the color theme when in high contrast light mode and {0} is enabled.",
         formatSettingAsLink(ThemeSettings.DETECT_HC)
     )),
@@ -97,12 +97,12 @@ const preferredHCLightThemeSettingSchema = {
     enum: colorThemeSettingEnum,
     enumDescriptions: colorThemeSettingEnumDescriptions,
     enumItemLabels: colorThemeSettingEnumItemLabels,
-    errorMessage: ( localize(16148, "Theme is unknown or not installed."))
+    errorMessage: ( localize(16446, "Theme is unknown or not installed."))
 };
 const detectColorSchemeSettingSchema = {
     type: "boolean",
     markdownDescription: ( localize(
-        16153,
+        16451,
         "If enabled, will automatically select a color theme based on the system color mode. If the system color mode is dark, {0} is used, else {1}.",
         formatSettingAsLink(ThemeSettings.PREFERRED_DARK_THEME),
         formatSettingAsLink(ThemeSettings.PREFERRED_LIGHT_THEME)
@@ -112,7 +112,7 @@ const detectColorSchemeSettingSchema = {
 };
 const colorCustomizationsSchema = {
     type: "object",
-    description: ( localize(16154, "Overrides colors from the currently selected color theme.")),
+    description: ( localize(16452, "Overrides colors from the currently selected color theme.")),
     allOf: [{
         $ref: workbenchColorsSchemaId
     }],
@@ -125,28 +125,28 @@ const fileIconThemeSettingSchema = {
     type: ["string", "null"],
     default: ThemeSettingDefaults.FILE_ICON_THEME,
     description: ( localize(
-        16155,
+        16453,
         "Specifies the file icon theme used in the workbench or 'null' to not show any file icons."
     )),
     enum: [null],
-    enumItemLabels: [( localize(16156, "None"))],
-    enumDescriptions: [( localize(16157, "No file icons"))],
-    errorMessage: ( localize(16158, "File icon theme is unknown or not installed."))
+    enumItemLabels: [( localize(16454, "None"))],
+    enumDescriptions: [( localize(16455, "No file icons"))],
+    errorMessage: ( localize(16456, "File icon theme is unknown or not installed."))
 };
 const productIconThemeSettingSchema = {
     type: ["string", "null"],
     default: ThemeSettingDefaults.PRODUCT_ICON_THEME,
-    description: ( localize(16159, "Specifies the product icon theme used.")),
+    description: ( localize(16457, "Specifies the product icon theme used.")),
     enum: [ThemeSettingDefaults.PRODUCT_ICON_THEME],
-    enumItemLabels: [( localize(16160, "Default"))],
-    enumDescriptions: [( localize(16161, "Default"))],
-    errorMessage: ( localize(16162, "Product icon theme is unknown or not installed."))
+    enumItemLabels: [( localize(16458, "Default"))],
+    enumDescriptions: [( localize(16459, "Default"))],
+    errorMessage: ( localize(16460, "Product icon theme is unknown or not installed."))
 };
 const detectHCSchemeSettingSchema = {
     type: "boolean",
     default: true,
     markdownDescription: ( localize(
-        16163,
+        16461,
         "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by {0} and {1}.",
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_DARK_THEME),
         formatSettingAsLink(ThemeSettings.PREFERRED_HC_LIGHT_THEME)
@@ -190,31 +190,31 @@ const themeSpecificSettingKey = "^\\[[^\\]]*(\\]\\s*\\[[^\\]]*)*\\]$";
 const tokenColorSchema = {
     type: "object",
     properties: {
-        comments: tokenGroupSettings(( localize(16164, "Sets the colors and styles for comments"))),
-        strings: tokenGroupSettings(( localize(16165, "Sets the colors and styles for strings literals."))),
-        keywords: tokenGroupSettings(( localize(16166, "Sets the colors and styles for keywords."))),
-        numbers: tokenGroupSettings(( localize(16167, "Sets the colors and styles for number literals."))),
-        types: tokenGroupSettings(( localize(16168, "Sets the colors and styles for type declarations and references."))),
+        comments: tokenGroupSettings(( localize(16462, "Sets the colors and styles for comments"))),
+        strings: tokenGroupSettings(( localize(16463, "Sets the colors and styles for strings literals."))),
+        keywords: tokenGroupSettings(( localize(16464, "Sets the colors and styles for keywords."))),
+        numbers: tokenGroupSettings(( localize(16465, "Sets the colors and styles for number literals."))),
+        types: tokenGroupSettings(( localize(16466, "Sets the colors and styles for type declarations and references."))),
         functions: tokenGroupSettings(( localize(
-            16169,
+            16467,
             "Sets the colors and styles for functions declarations and references."
         ))),
         variables: tokenGroupSettings(( localize(
-            16170,
+            16468,
             "Sets the colors and styles for variables declarations and references."
         ))),
         textMateRules: {
-            description: ( localize(16171, "Sets colors and styles using textmate theming rules (advanced).")),
+            description: ( localize(16469, "Sets colors and styles using textmate theming rules (advanced).")),
             $ref: textmateColorsSchemaId
         },
         semanticHighlighting: {
-            description: ( localize(16172, "Whether semantic highlighting should be enabled for this theme.")),
+            description: ( localize(16470, "Whether semantic highlighting should be enabled for this theme.")),
             deprecationMessage: ( localize(
-                16173,
+                16471,
                 "Use `enabled` in `editor.semanticTokenColorCustomizations` setting instead."
             )),
             markdownDeprecationMessage: ( localize(
-                16174,
+                16472,
                 "Use `enabled` in {0} setting instead.",
                 formatSettingAsLink("editor.semanticTokenColorCustomizations")
             )),
@@ -225,7 +225,7 @@ const tokenColorSchema = {
 };
 const tokenColorCustomizationSchema = {
     description: ( localize(
-        16175,
+        16473,
         "Overrides editor syntax colors and font style from the currently selected color theme."
     )),
     default: {},
@@ -242,14 +242,14 @@ const semanticTokenColorSchema = {
         enabled: {
             type: "boolean",
             description: ( localize(
-                16176,
+                16474,
                 "Whether semantic highlighting is enabled or disabled for this theme"
             )),
             suggestSortText: "0_enabled"
         },
         rules: {
             $ref: tokenStylingSchemaId,
-            description: ( localize(16177, "Semantic token styling rules for this theme.")),
+            description: ( localize(16475, "Semantic token styling rules for this theme.")),
             suggestSortText: "0_rules"
         }
     },
@@ -257,7 +257,7 @@ const semanticTokenColorSchema = {
 };
 const semanticTokenColorCustomizationSchema = {
     description: ( localize(
-        16178,
+        16476,
         "Overrides editor semantic token color and styles from the currently selected color theme."
     )),
     default: {},
@@ -339,9 +339,26 @@ const colorSchemeToPreferred = {
     [ColorScheme.HIGH_CONTRAST_LIGHT]: ThemeSettings.PREFERRED_HC_LIGHT_THEME
 };
 class ThemeConfiguration {
-    constructor(configurationService, hostColorService) {
+    constructor(configurationService, hostColorService, isNewUser = false) {
         this.configurationService = configurationService;
         this.hostColorService = hostColorService;
+        this.isNewUser = isNewUser;
+    }
+    shouldAutoDetectColorScheme() {
+        const {
+            value,
+            userValue,
+            userLocalValue,
+            userRemoteValue
+        } = this.configurationService.inspect(ThemeSettings.DETECT_COLOR_SCHEME);
+        if (value) {
+            return true;
+        }
+        if (this.isNewUser) {
+            const hasUserScopedValue = userValue !== undefined || userLocalValue !== undefined || userRemoteValue !== undefined;
+            return !hasUserScopedValue;
+        }
+        return false;
     }
     get colorTheme() {
         return this.configurationService.getValue(this.getColorThemeSettingId());
@@ -388,13 +405,13 @@ class ThemeConfiguration {
         if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && this.hostColorService.highContrast) {
             return this.hostColorService.dark ? ColorScheme.HIGH_CONTRAST_DARK : ColorScheme.HIGH_CONTRAST_LIGHT;
         }
-        if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
+        if (this.shouldAutoDetectColorScheme()) {
             return this.hostColorService.dark ? ColorScheme.DARK : ColorScheme.LIGHT;
         }
         return undefined;
     }
     isDetectingColorScheme() {
-        return this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME);
+        return this.shouldAutoDetectColorScheme();
     }
     getColorThemeSettingId() {
         const preferredScheme = this.getPreferredColorScheme();

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

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { joinPath, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ExtensionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
+import { ExtensionData, migrateThemeSettingsId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
@@ -16,7 +16,7 @@ function registerColorThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "themes",
         jsonSchema: {
-            description: ( localize(16179, "Contributes textmate color themes.")),
+            description: ( localize(16477, "Contributes textmate color themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -30,17 +30,17 @@ function registerColorThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(16180, "Id of the color theme as used in the user settings.")),
+                        description: ( localize(16478, "Id of the color theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(16181, "Label of the color theme as shown in the UI.")),
+                        description: ( localize(16479, "Label of the color theme as shown in the UI.")),
                         type: "string"
                     },
                     uiTheme: {
-                        description: ( localize(
-                            16182,
-                            "Base theme defining the colors around the editor: 'vs' is the light color theme, 'vs-dark' is the dark color theme. 'hc-black' is the dark high contrast theme, 'hc-light' is the light high contrast theme."
+                        markdownDescription: ( localize(
+                            16480,
+                            "Base theme defining the colors around the editor: `vs` is the light color theme, `vs-dark` is the dark color theme. `hc-black` is the dark high contrast theme, `hc-light` is the light high contrast theme."
                         )),
                         enum: [
                             ThemeTypeSelector.VS,
@@ -50,9 +50,9 @@ function registerColorThemeExtensionPoint() {
                         ]
                     },
                     path: {
-                        description: ( localize(
-                            16183,
-                            "Path of the tmTheme file. The path is relative to the extension folder and is typically './colorthemes/awesome-color-theme.json'."
+                        markdownDescription: ( localize(
+                            16481,
+                            "Path of the tmTheme file. The path is relative to the extension folder and is typically `./colorthemes/awesome-color-theme.json`."
                         )),
                         type: "string"
                     }
@@ -66,7 +66,7 @@ function registerFileIconThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "iconThemes",
         jsonSchema: {
-            description: ( localize(16184, "Contributes file icon themes.")),
+            description: ( localize(16482, "Contributes file icon themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -79,16 +79,16 @@ function registerFileIconThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(16185, "Id of the file icon theme as used in the user settings.")),
+                        description: ( localize(16483, "Id of the file icon theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(16186, "Label of the file icon theme as shown in the UI.")),
+                        description: ( localize(16484, "Label of the file icon theme as shown in the UI.")),
                         type: "string"
                     },
                     path: {
                         description: ( localize(
-                            16187,
+                            16485,
                             "Path of the file icon theme definition file. The path is relative to the extension folder and is typically './fileicons/awesome-icon-theme.json'."
                         )),
                         type: "string"
@@ -103,7 +103,7 @@ function registerProductIconThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "productIconThemes",
         jsonSchema: {
-            description: ( localize(16188, "Contributes product icon themes.")),
+            description: ( localize(16486, "Contributes product icon themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -116,16 +116,16 @@ function registerProductIconThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(16189, "Id of the product icon theme as used in the user settings.")),
+                        description: ( localize(16487, "Id of the product icon theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(16190, "Label of the product icon theme as shown in the UI.")),
+                        description: ( localize(16488, "Label of the product icon theme as shown in the UI.")),
                         type: "string"
                     },
                     path: {
                         description: ( localize(
-                            16191,
+                            16489,
                             "Path of the product icon theme definition file. The path is relative to the extension folder and is typically './producticons/awesome-product-icon-theme.json'."
                         )),
                         type: "string"
@@ -147,19 +147,19 @@ class ThemeDataRenderer extends Disposable {
     render(manifest) {
         const markdown = ( new MarkdownString());
         if (manifest.contributes?.themes) {
-            markdown.appendMarkdown(`### ${( localize(16192, "Color Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16490, "Color Themes"))}\n\n`);
             for (const theme of manifest.contributes.themes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
         }
         if (manifest.contributes?.iconThemes) {
-            markdown.appendMarkdown(`### ${( localize(16193, "File Icon Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16491, "File Icon Themes"))}\n\n`);
             for (const theme of manifest.contributes.iconThemes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
         }
         if (manifest.contributes?.productIconThemes) {
-            markdown.appendMarkdown(`### ${( localize(16194, "Product Icon Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16492, "Product Icon Themes"))}\n\n`);
             for (const theme of manifest.contributes.productIconThemes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
@@ -172,7 +172,7 @@ class ThemeDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "themes",
-    label: ( localize(16195, "Themes")),
+    label: ( localize(16493, "Themes")),
     access: {
         canToggle: false
     },
@@ -234,13 +234,13 @@ class ThemeRegistry {
         log
     ) {
         if (!Array.isArray(themeContributions)) {
-            log?.error(( localize(16196, "Extension point `{0}` must be an array.", this.themesExtPoint.name)));
+            log?.error(( localize(16494, "Extension point `{0}` must be an array.", this.themesExtPoint.name)));
             return resultingThemes;
         }
         themeContributions.forEach(theme => {
             if (!theme.path || !isString(theme.path)) {
                 log?.error(( localize(
-                    16197,
+                    16495,
                     "Expected string in `contributes.{0}.path`. Provided value: {1}",
                     this.themesExtPoint.name,
                     String(theme.path)
@@ -249,7 +249,7 @@ class ThemeRegistry {
             }
             if (this.idRequired && (!theme.id || !isString(theme.id))) {
                 log?.error(( localize(
-                    16198,
+                    16496,
                     "Expected string in `contributes.{0}.id`. Provided value: {1}",
                     this.themesExtPoint.name,
                     String(theme.id)
@@ -259,7 +259,7 @@ class ThemeRegistry {
             const themeLocation = joinPath(extensionLocation, theme.path);
             if (!isEqualOrParent(themeLocation, extensionLocation)) {
                 log?.warn(( localize(
-                    16199,
+                    16497,
                     "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                     this.themesExtPoint.name,
                     themeLocation.path,
@@ -284,13 +284,14 @@ class ThemeRegistry {
         return undefined;
     }
     findThemeBySettingsId(settingsId, defaultSettingsId) {
-        if (this.builtInTheme && this.builtInTheme.settingsId === settingsId) {
+        const migratedId = settingsId ? migrateThemeSettingsId(settingsId) : settingsId;
+        if (this.builtInTheme && this.builtInTheme.settingsId === migratedId) {
             return this.builtInTheme;
         }
         const allThemes = this.getThemes();
         let defaultTheme = undefined;
         for (const t of allThemes) {
-            if (t.settingsId === settingsId) {
+            if (t.settingsId === migratedId) {
                 return t;
             }
             if (t.settingsId === defaultSettingsId) {