@codingame/monaco-vscode-theme-service-override 6.0.3 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "6.0.3",
+  "version": "7.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.3",
-    "@codingame/monaco-vscode-files-service-override": "6.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.1",
+    "@codingame/monaco-vscode-files-service-override": "7.0.1"
   }
 }

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

@@ -365,7 +365,7 @@ function handleParentFolder(key, selectors) {
     return key;
 }
 function escapeCSS(str) {
-    str = str.replace(/[\11\12\14\15\40]/g, '/');
+    str = str.replace(/[\x11\x12\x14\x15\x40]/g, '/');
     return mainWindow.CSS.escape(str);
 }
 

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

@@ -121,6 +121,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
         this.onProductIconThemeChange = ( new Emitter());
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
         this.productIconThemeSequencer = ( new Sequencer());
+        this._register(this.onDidColorThemeChange(theme => getColorRegistry().notifyThemeUpdate(theme)));
         let themeData = ColorThemeData.fromStorageData(this.storageService);
         const colorThemeSetting = this.settings.colorTheme;
         if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {

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

@@ -4,9 +4,9 @@ import { Color } from 'vscode/vscode/vs/base/common/color';
 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { isUndefined, isString, isObject, isBoolean } from 'vscode/vscode/vs/base/common/types';
+import { isString, isObject, isBoolean } from 'vscode/vscode/vs/base/common/types';
 import { extname, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
-import { Extensions } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { Extensions, DEFAULT_COLOR_CONFIG_VALUE } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
 import { editorForeground, editorBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
@@ -94,15 +94,20 @@ class ColorThemeData {
         return this.textMateThemingRules;
     }
     getColor(colorId, useDefault) {
-        let color = this.customColorMap[colorId];
-        if (color) {
-            return color;
+        const customColor = this.customColorMap[colorId];
+        if (customColor instanceof Color) {
+            return customColor;
+        }
+        if (customColor === undefined) {
+            const color = this.colorMap[colorId];
+            if (color !== undefined) {
+                return color;
+            }
         }
-        color = this.colorMap[colorId];
-        if (useDefault !== false && isUndefined(color)) {
-            color = this.getDefault(colorId);
+        if (useDefault !== false) {
+            return this.getDefault(colorId);
         }
-        return color;
+        return undefined;
     }
     getTokenStyle(type, modifiers, language, useDefault = true, definitions = {}) {
         const result = {
@@ -286,7 +291,11 @@ class ColorThemeData {
         return undefined;
     }
     defines(colorId) {
-        return this.customColorMap.hasOwnProperty(colorId) || this.colorMap.hasOwnProperty(colorId);
+        const customColor = this.customColorMap[colorId];
+        if (customColor instanceof Color) {
+            return true;
+        }
+        return customColor === undefined  && this.colorMap.hasOwnProperty(colorId);
     }
     setCustomizations(settings) {
         this.setCustomColors(settings.colorCustomizations);
@@ -307,7 +316,10 @@ class ColorThemeData {
     overwriteCustomColors(colors) {
         for (const id in colors) {
             const colorVal = colors[id];
-            if (typeof colorVal === 'string') {
+            if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
+                this.customColorMap[id] = DEFAULT_COLOR_CONFIG_VALUE;
+            }
+            else if (typeof colorVal === 'string') {
                 this.customColorMap[id] = ( (Color.fromHex(colorVal)));
             }
         }
@@ -625,8 +637,11 @@ async function _loadColorTheme(extensionResourceLoaderService, themeLocation, re
                 ))))));
             }
             for (const colorId in colors) {
-                const colorHex = colors[colorId];
-                if (typeof colorHex === 'string') {
+                const colorVal = colors[colorId];
+                if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
+                    delete result.colors[colorId];
+                }
+                else if (typeof colorVal === 'string') {
                     result.colors[colorId] = ( (Color.fromHex(colors[colorId])));
                 }
             }