From eae6de34882431190fe0f61ad54a3bd6bf28b322 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Sat, 12 Aug 2017 13:06:35 +0200
Subject: [PATCH] Ignore 'null' as color values

---
 .../themes/electron-browser/colorThemeData.ts         | 11 ++++-------
 .../themes/electron-browser/themeCompatibility.ts     |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
index 06bdf8f552e..e4c92d58b45 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
@@ -81,10 +81,7 @@ export class ColorThemeData implements IColorTheme {
 		for (let id in colors) {
 			let colorVal = colors[id];
 			if (typeof colorVal === 'string') {
-				let color = Color.fromHex(colorVal);
-				if (color) {
-					this.customColorMap[id] = color;
-				}
+				this.customColorMap[id] = Color.fromHex(colorVal);
 			}
 		}
 		if (this.themeTokenColors && this.themeTokenColors.length) {
@@ -257,9 +254,9 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat
 					}
 					// new JSON color themes format
 					for (let colorId in colors) {
-						let colorHex = Color.fromHex(colors[colorId]);
-						if (colorHex) { // ignore invalid colors
-							resultColors[colorId] = colorHex;
+						let colorHex = colors[colorId];
+						if (typeof colorHex === 'string') { // ignore colors tht are null
+							resultColors[colorId] = Color.fromHex(colors[colorId]);
 						}
 					}
 				}
diff --git a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
index 36ad98512fd..05a2f54c778 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
@@ -31,8 +31,9 @@ export function convertSettings(oldSettings: ITokenColorizationRule[], resultRul
 				for (let key in settings) {
 					let mappings = settingToColorIdMapping[key];
 					if (mappings) {
-						let color = Color.fromHex(settings[key]);
-						if (color) {
+						let colorHex = settings[key];
+						if (typeof colorHex === 'string') {
+							let color = Color.fromHex(colorHex);
 							for (let colorId of mappings) {
 								resultColors[colorId] = color;
 							}
-- 
GitLab