Ignore 'null' as color values

aeschli · aeschli · commit eae6de348824 · 2017-08-12T13:06:41.000+02:00
diff --git 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
@@ -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;
 							}

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,7 @@ export class ColorThemeData implements IColorTheme {`
`81`	`81`	`for (let id in colors) {`
`82`	`82`	`let colorVal = colors[id];`
`83`	`83`	`if (typeof colorVal === 'string') {`
`84`		`- let color = Color.fromHex(colorVal);`
`85`		`- if (color) {`
`86`		`- this.customColorMap[id] = color;`
`87`		`- }`
	`84`	`+ this.customColorMap[id] = Color.fromHex(colorVal);`
`88`	`85`	`}`
`89`	`86`	`}`
`90`	`87`	`if (this.themeTokenColors && this.themeTokenColors.length) {`
`@@ -257,9 +254,9 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat`
`257`	`254`	`}`
`258`	`255`	`// new JSON color themes format`
`259`	`256`	`for (let colorId in colors) {`
`260`		`- let colorHex = Color.fromHex(colors[colorId]);`
`261`		`- if (colorHex) { // ignore invalid colors`
`262`		`- resultColors[colorId] = colorHex;`
	`257`	`+ let colorHex = colors[colorId];`
	`258`	`+ if (typeof colorHex === 'string') { // ignore colors tht are null`
	`259`	`+ resultColors[colorId] = Color.fromHex(colors[colorId]);`
`263`	`260`	`}`
`264`	`261`	`}`
`265`	`262`	`}`