@codingame/monaco-vscode-theme-service-override 2.0.3 → 2.1.0

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
@@ -387,11 +387,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'selectTheme.label',
-                "Color Theme"
-            )), original: 'Color Theme' },
+                'Color Theme'
+            )),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -449,11 +449,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'selectIconTheme.label',
-                "File Icon Theme"
-            )), original: 'File Icon Theme' },
+                'File Icon Theme'
+            )),
             category: Categories.Preferences,
             f1: true
         });
@@ -500,11 +500,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'selectProductIconTheme.label',
-                "Product Icon Theme"
-            )), original: 'Product Icon Theme' },
+                'Product Icon Theme'
+            )),
             category: Categories.Preferences,
             f1: true
         });
@@ -621,11 +621,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'generateColorTheme.label',
-                "Generate Color Theme From Current Settings"
-            )), original: 'Generate Color Theme From Current Settings' },
+                'Generate Color Theme From Current Settings'
+            )),
             category: Categories.Developer,
             f1: true
         });
@@ -675,11 +675,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'toggleLightDarkThemes.label',
-                "Toggle between Light/Dark Themes"
-            )), original: 'Toggle between Light/Dark Themes' },
+                'Toggle between Light/Dark Themes'
+            )),
             category: Categories.Preferences,
             f1: true,
         });
@@ -717,11 +717,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/themes/browser/themes.contribution',
                 'browseColorThemeInMarketPlace.label',
-                "Browse Color Themes in Marketplace"
-            )), original: 'Browse Color Themes in Marketplace' },
+                'Browse Color Themes in Marketplace'
+            )),
             category: Categories.Preferences,
             f1: true,
         });
@@ -782,7 +782,7 @@ MenuRegistry.appendMenuItem(ThemesSubMenu, {
         title: ( localizeWithPath(
             'vs/workbench/contrib/themes/browser/themes.contribution',
             'selectTheme.label',
-            "Color Theme"
+            'Color Theme'
         ))
     },
     order: 1

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

@@ -158,7 +158,8 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         const initializeColorTheme = async () => {
             const devThemes = this.colorThemeRegistry.findThemeByExtensionLocation(extDevLoc);
             if (devThemes.length) {
-                return this.setColorTheme(devThemes[0].id, 8 );
+                const matchedColorTheme = devThemes.find(theme => theme.type === this.currentColorTheme.type);
+                return this.setColorTheme(matchedColorTheme ? matchedColorTheme.id : devThemes[0].id, undefined);
             }
             const preferredColorScheme = this.getPreferredColorScheme();
             const prevScheme = this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE);