@codingame/monaco-vscode-theme-service-override 1.82.6 → 1.83.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "1.82.6",
+  "version": "1.83.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.82.6",
-    "monaco-editor": "0.43.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0",
+    "monaco-editor": "0.44.0"
   }
 }

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

@@ -66,6 +66,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.extensionResourceLoaderService = extensionResourceLoaderService;
         this.logService = logService;
         this.hostColorService = hostColorService;
+        this.userDataInitializationService = userDataInitializationService;
         this.hasDefaultUpdated = false;
         this.themeExtensionsActivated = ( (new Map()));
         this.container = layoutService.container;
@@ -134,7 +135,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         if (productIconData) {
             this.applyAndSetProductIconTheme(productIconData, true);
         }
-        Promise.all([extensionService.whenInstalledExtensionsRegistered(), userDataInitializationService.whenInitializationFinished()]).then(_ => {
+        extensionService.whenInstalledExtensionsRegistered().then(_ => {
             this.installConfigurationListener();
             this.installPreferredSchemeListener();
             this.installRegistryListeners();
@@ -158,16 +159,20 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             if (devThemes.length) {
                 return this.setColorTheme(devThemes[0].id, 8 );
             }
-            const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
-            const theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, fallbackTheme);
             const preferredColorScheme = this.getPreferredColorScheme();
             const prevScheme = this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE);
             if (preferredColorScheme !== prevScheme) {
                 this.storageService.store(PERSISTED_OS_COLOR_SCHEME, preferredColorScheme, PERSISTED_OS_COLOR_SCHEME_SCOPE, 0 );
-                if (preferredColorScheme && theme?.type !== preferredColorScheme) {
+                if (preferredColorScheme && this.currentColorTheme.type !== preferredColorScheme) {
                     return this.applyPreferredColorTheme(preferredColorScheme);
                 }
             }
+            let theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, undefined);
+            if (!theme) {
+                await this.userDataInitializationService.whenInitializationFinished();
+                const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
+                theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, fallbackTheme);
+            }
             return this.setColorTheme(theme && theme.id, undefined);
         };
         const initializeFileIconTheme = async () => {
@@ -175,7 +180,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             if (devThemes.length) {
                 return this.setFileIconTheme(devThemes[0].id, 8 );
             }
-            const theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
+            let theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
+            if (!theme) {
+                await this.userDataInitializationService.whenInitializationFinished();
+                theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
+            }
             return this.setFileIconTheme(theme ? theme.id : DEFAULT_FILE_ICON_THEME_ID, undefined);
         };
         const initializeProductIconTheme = async () => {
@@ -183,7 +192,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
             if (devThemes.length) {
                 return this.setProductIconTheme(devThemes[0].id, 8 );
             }
-            const theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
+            let theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
+            if (!theme) {
+                await this.userDataInitializationService.whenInitializationFinished();
+                theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
+            }
             return this.setProductIconTheme(theme ? theme.id : DEFAULT_PRODUCT_ICON_THEME_ID, undefined);
         };
         return Promise.all([initializeColorTheme(), initializeFileIconTheme(), initializeProductIconTheme()]);

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

@@ -1,5 +1,5 @@
 import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import * as colors from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import * as colorRegistry from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import * as editorColorRegistry from 'monaco-editor/esm/vs/editor/common/core/editorColorRegistry.js';
 
 const settingToColorIdMapping = {};
@@ -39,17 +39,17 @@ function convertSettings(oldSettings, result) {
         }
     }
 }
-addSettingMapping('background', colors.editorBackground);
-addSettingMapping('foreground', colors.editorForeground);
-addSettingMapping('selection', colors.editorSelectionBackground);
-addSettingMapping('inactiveSelection', colors.editorInactiveSelection);
-addSettingMapping('selectionHighlightColor', colors.editorSelectionHighlight);
-addSettingMapping('findMatchHighlight', colors.editorFindMatchHighlight);
-addSettingMapping('currentFindMatchHighlight', colors.editorFindMatch);
-addSettingMapping('hoverHighlight', colors.editorHoverHighlight);
+addSettingMapping('background', colorRegistry.editorBackground);
+addSettingMapping('foreground', colorRegistry.editorForeground);
+addSettingMapping('selection', colorRegistry.editorSelectionBackground);
+addSettingMapping('inactiveSelection', colorRegistry.editorInactiveSelection);
+addSettingMapping('selectionHighlightColor', colorRegistry.editorSelectionHighlight);
+addSettingMapping('findMatchHighlight', colorRegistry.editorFindMatchHighlight);
+addSettingMapping('currentFindMatchHighlight', colorRegistry.editorFindMatch);
+addSettingMapping('hoverHighlight', colorRegistry.editorHoverHighlight);
 addSettingMapping('wordHighlight', 'editor.wordHighlightBackground');
 addSettingMapping('wordHighlightStrong', 'editor.wordHighlightStrongBackground');
-addSettingMapping('findRangeHighlight', colors.editorFindRangeHighlight);
+addSettingMapping('findRangeHighlight', colorRegistry.editorFindRangeHighlight);
 addSettingMapping('findMatchHighlight', 'peekViewResult.matchHighlightBackground');
 addSettingMapping('referenceHighlight', 'peekViewEditor.matchHighlightBackground');
 addSettingMapping('lineHighlight', editorColorRegistry.editorLineHighlight);