"default" colorCustomization doesn't get unset when removing setting override (microsoft#218362)

Author: aeschli

src/vs/workbench/services/themes/common/colorThemeData.ts

@@ -45,6 +45,10 @@ export type TokenStyleDefinitions = { [P in keyof TokenStyleData]?: TokenStyleDe
 
 export type TextMateThemingRuleDefinitions = { [P in keyof TokenStyleData]?: ITextMateThemingRule | undefined; } & { scope?: ProbeScope };
 
+interface IColorOrDefaultMap {
+	[id: string]: Color | typeof DEFAULT_COLOR_CONFIG_VALUE;
+}
+
 export class ColorThemeData implements IWorkbenchColorTheme {
 
 	static readonly STORAGE_KEY = 'colorThemeData';
@@ -65,7 +69,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	private themeTokenColors: ITextMateThemingRule[] = [];
 	private customTokenColors: ITextMateThemingRule[] = [];
 	private colorMap: IColorMap = {};
-	private customColorMap: IColorMap = {};
+	private customColorMap: IColorOrDefaultMap = {};
 
 	private semanticTokenRules: SemanticTokenRule[] = [];
 	private customSemanticTokenRules: SemanticTokenRule[] = [];
@@ -132,15 +136,20 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	}
 
 	public getColor(colorId: ColorIdentifier, useDefault?: boolean): Color | undefined {
-		let color: Color | undefined = this.customColorMap[colorId];
-		if (color) {
-			return color;
+		const customColor = this.customColorMap[colorId];
+		if (customColor instanceof Color) {
+			return customColor;
+		}
+		if (customColor === undefined) { /* !== DEFAULT_COLOR_CONFIG_VALUE */
+			const color = this.colorMap[colorId];
+			if (color !== undefined) {
+				return color;
+			}
 		}
-		color = this.colorMap[colorId];
-		if (useDefault !== false && types.isUndefined(color)) {
-			color = this.getDefault(colorId);
+		if (useDefault !== false) {
+			return this.getDefault(colorId);
 		}
-		return color;
+		return undefined;
 	}
 
 	private getTokenStyle(type: string, modifiers: string[], language: string, useDefault = true, definitions: TokenStyleDefinitions = {}): TokenStyle | undefined {
@@ -346,7 +355,11 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	}
 
 	public defines(colorId: ColorIdentifier): boolean {
-		return this.customColorMap.hasOwnProperty(colorId) || this.colorMap.hasOwnProperty(colorId);
+		const customColor = this.customColorMap[colorId];
+		if (customColor instanceof Color) {
+			return true;
+		}
+		return customColor === undefined /* !== DEFAULT_COLOR_CONFIG_VALUE */ && this.colorMap.hasOwnProperty(colorId);
 	}
 
 	public setCustomizations(settings: ThemeConfiguration) {
@@ -373,7 +386,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		for (const id in colors) {
 			const colorVal = colors[id];
 			if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
-				delete this.colorMap[id];
+				this.customColorMap[id] = DEFAULT_COLOR_CONFIG_VALUE;
 			} else if (typeof colorVal === 'string') {
 				this.customColorMap[id] = Color.fromHex(colorVal);
 			}
@@ -719,9 +732,9 @@ async function _loadColorTheme(extensionResourceLoaderService: IExtensionResourc
 			// new JSON color themes format
 			for (const colorId in colors) {
 				const colorVal = colors[colorId];
-				if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
+				if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) { // ignore colors that are set to to default
 					delete result.colors[colorId];
-				} else if (typeof colorVal === 'string') { // ignore colors that are null
+				} else if (typeof colorVal === 'string') {
 					result.colors[colorId] = Color.fromHex(colors[colorId]);
 				}
 			}