@codingame/monaco-vscode-theme-service-override 1.85.1 → 1.85.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "1.85.1",
+  "version": "1.85.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.2",
     "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.1"
+    "@codingame/monaco-vscode-files-service-override": "1.85.2"
   }
 }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as types from 'monaco-editor/esm/vs/base/common/types.js';
+import * as Types from 'monaco-editor/esm/vs/base/common/types.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ThemeSettingDefaults, COLOR_THEME_LIGHT_INITIAL_COLORS, COLOR_THEME_DARK_INITIAL_COLORS, ThemeSettings, ExtensionData, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
@@ -261,7 +261,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.colorThemeRegistry.onDidChange(async (event) => {
             updateColorThemeConfigurationSchemas(event.themes);
             if (await this.restoreColorTheme()) {
-                if (this.currentColorTheme.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK && !types.isUndefined(prevColorId) && (await this.colorThemeRegistry.findThemeById(prevColorId))) {
+                if (this.currentColorTheme.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK && !Types.isUndefined(prevColorId) && (await this.colorThemeRegistry.findThemeById(prevColorId))) {
                     await this.setColorTheme(prevColorId, 'auto');
                     prevColorId = undefined;
                 }
@@ -279,7 +279,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.fileIconThemeRegistry.onDidChange(async (event) => {
             updateFileIconThemeConfigurationSchemas(event.themes);
             if (await this.restoreFileIconTheme()) {
-                if (this.currentFileIconTheme.id === DEFAULT_FILE_ICON_THEME_ID && !types.isUndefined(prevFileIconId) && this.fileIconThemeRegistry.findThemeById(prevFileIconId)) {
+                if (this.currentFileIconTheme.id === DEFAULT_FILE_ICON_THEME_ID && !Types.isUndefined(prevFileIconId) && this.fileIconThemeRegistry.findThemeById(prevFileIconId)) {
                     await this.setFileIconTheme(prevFileIconId, 'auto');
                     prevFileIconId = undefined;
                 }
@@ -296,7 +296,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.productIconThemeRegistry.onDidChange(async (event) => {
             updateProductIconThemeConfigurationSchemas(event.themes);
             if (await this.restoreProductIconTheme()) {
-                if (this.currentProductIconTheme.id === DEFAULT_PRODUCT_ICON_THEME_ID && !types.isUndefined(prevProductIconId) && this.productIconThemeRegistry.findThemeById(prevProductIconId)) {
+                if (this.currentProductIconTheme.id === DEFAULT_PRODUCT_ICON_THEME_ID && !Types.isUndefined(prevProductIconId) && this.productIconThemeRegistry.findThemeById(prevProductIconId)) {
                     await this.setProductIconTheme(prevProductIconId, 'auto');
                     prevProductIconId = undefined;
                 }
@@ -406,7 +406,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         if (!themeIdOrTheme) {
             return null;
         }
-        const themeId = types.isString(themeIdOrTheme) ? validateThemeId(themeIdOrTheme) : themeIdOrTheme.id;
+        const themeId = Types.isString(themeIdOrTheme) ? validateThemeId(themeIdOrTheme) : themeIdOrTheme.id;
         if (this.currentColorTheme.isLoaded && themeId === this.currentColorTheme.id) {
             if (settingsTarget !== 'preview') {
                 this.currentColorTheme.toStorage(this.storageService);
@@ -541,7 +541,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         if (iconThemeOrId === undefined) {
             iconThemeOrId = '';
         }
-        const themeId = types.isString(iconThemeOrId) ? iconThemeOrId : iconThemeOrId.id;
+        const themeId = Types.isString(iconThemeOrId) ? iconThemeOrId : iconThemeOrId.id;
         if (themeId !== this.currentFileIconTheme.id || !this.currentFileIconTheme.isLoaded) {
             let newThemeData = this.fileIconThemeRegistry.findThemeById(themeId);
             if (!newThemeData && iconThemeOrId instanceof FileIconThemeData) {
@@ -631,7 +631,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         if (iconThemeOrId === undefined) {
             iconThemeOrId = '';
         }
-        const themeId = types.isString(iconThemeOrId) ? iconThemeOrId : iconThemeOrId.id;
+        const themeId = Types.isString(iconThemeOrId) ? iconThemeOrId : iconThemeOrId.id;
         if (themeId !== this.currentProductIconTheme.id || !this.currentProductIconTheme.isLoaded) {
             let newThemeData = this.productIconThemeRegistry.findThemeById(themeId);
             if (!newThemeData && iconThemeOrId instanceof ProductIconThemeData) {

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

@@ -4,7 +4,7 @@ import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
 import { THEME_SCOPE_OPEN_PAREN, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_WILDCARD, themeScopeRegex, ExtensionData, VS_HC_LIGHT_THEME, VS_HC_THEME, VS_LIGHT_THEME } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { convertSettings } from './themeCompatibility.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as types from 'monaco-editor/esm/vs/base/common/types.js';
+import * as Types from 'monaco-editor/esm/vs/base/common/types.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
 import { Extensions, editorForeground, editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { getThemeTypeSelector } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
@@ -86,7 +86,7 @@ class ColorThemeData {
             return color;
         }
         color = this.colorMap[colorId];
-        if (useDefault !== false && types.isUndefined(color)) {
+        if (useDefault !== false && Types.isUndefined(color)) {
             color = this.getDefault(colorId);
         }
         return color;
@@ -251,7 +251,7 @@ class ColorThemeData {
                             foregroundScore = score;
                             foregroundThemingRule = themingRule;
                         }
-                        if (score >= fontStyleScore && types.isString(settings.fontStyle)) {
+                        if (score >= fontStyleScore && Types.isString(settings.fontStyle)) {
                             fontStyle = settings.fontStyle;
                             fontStyleScore = score;
                             fontStyleThemingRule = themingRule;
@@ -284,7 +284,7 @@ class ColorThemeData {
         this.customColorMap = {};
         this.overwriteCustomColors(colors);
         const themeSpecificColors = this.getThemeSpecificColors(colors);
-        if (types.isObject(themeSpecificColors)) {
+        if (Types.isObject(themeSpecificColors)) {
             this.overwriteCustomColors(themeSpecificColors);
         }
         this.tokenColorIndex = undefined;
@@ -304,7 +304,7 @@ class ColorThemeData {
         this.customSemanticHighlightingDeprecated = undefined;
         this.addCustomTokenColors(customTokenColors);
         const themeSpecificTokenColors = this.getThemeSpecificColors(customTokenColors);
-        if (types.isObject(themeSpecificTokenColors)) {
+        if (Types.isObject(themeSpecificTokenColors)) {
             this.addCustomTokenColors(themeSpecificTokenColors);
         }
         this.tokenColorIndex = undefined;
@@ -320,7 +320,7 @@ class ColorThemeData {
                 this.readSemanticTokenRules(semanticTokenColors.rules);
             }
             const themeSpecificColors = this.getThemeSpecificColors(semanticTokenColors);
-            if (types.isObject(themeSpecificColors)) {
+            if (Types.isObject(themeSpecificColors)) {
                 if (themeSpecificColors.enabled !== undefined) {
                     this.customSemanticHighlighting = themeSpecificColors.enabled;
                 }
@@ -799,8 +799,8 @@ function readSemanticTokenRule(selectorString, settings) {
     return undefined;
 }
 function isSemanticTokenColorizationSetting(style) {
-    return style && (types.isString(style.foreground) || types.isString(style.fontStyle) || types.isBoolean(style.italic)
-        || types.isBoolean(style.underline) || types.isBoolean(style.strikethrough) || types.isBoolean(style.bold));
+    return style && (Types.isString(style.foreground) || Types.isString(style.fontStyle) || Types.isBoolean(style.italic)
+        || Types.isBoolean(style.underline) || Types.isBoolean(style.strikethrough) || Types.isBoolean(style.bold));
 }
 class TokenColorIndex {
     constructor() {

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

@@ -1,5 +1,5 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as types from 'monaco-editor/esm/vs/base/common/types.js';
+import * as Types from 'monaco-editor/esm/vs/base/common/types.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
 import { textmateColorsSchemaId, textmateColorGroupSchemaId } from './colorThemeSchema.js';
@@ -419,13 +419,13 @@ class ThemeConfiguration {
     }
     findAutoConfigurationTarget(key) {
         const settings = this.configurationService.inspect(key);
-        if (!types.isUndefined(settings.workspaceFolderValue)) {
+        if (!Types.isUndefined(settings.workspaceFolderValue)) {
             return 6 ;
         }
-        else if (!types.isUndefined(settings.workspaceValue)) {
+        else if (!Types.isUndefined(settings.workspaceValue)) {
             return 5 ;
         }
-        else if (!types.isUndefined(settings.userRemote)) {
+        else if (!Types.isUndefined(settings.userRemote)) {
             return 4 ;
         }
         return 2 ;
@@ -443,7 +443,7 @@ class ThemeConfiguration {
                 return Promise.resolve(undefined);
             }
             else if (value === settings.defaultValue) {
-                if (types.isUndefined(settings.userValue)) {
+                if (Types.isUndefined(settings.userValue)) {
                     return Promise.resolve(undefined);
                 }
                 value = undefined;

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

@@ -1,5 +1,5 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as types from 'monaco-editor/esm/vs/base/common/types.js';
+import * as Types from 'monaco-editor/esm/vs/base/common/types.js';
 import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
@@ -191,7 +191,7 @@ class ThemeRegistry {
             return resultingThemes;
         }
         themeContributions.forEach(theme => {
-            if (!theme.path || !types.isString(theme.path)) {
+            if (!theme.path || !Types.isString(theme.path)) {
                 log?.error(( nls.localizeWithPath(
                     'vs/workbench/services/themes/common/themeExtensionPoints',
                     'reqpath',
@@ -201,7 +201,7 @@ class ThemeRegistry {
                 )));
                 return;
             }
-            if (this.idRequired && (!theme.id || !types.isString(theme.id))) {
+            if (this.idRequired && (!theme.id || !Types.isString(theme.id))) {
                 log?.error(( nls.localizeWithPath(
                     'vs/workbench/services/themes/common/themeExtensionPoints',
                     'reqid',