maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[theme] don't cache default values as they are invalidated by color customization changes

Browse source
This commit is contained in:
Martin Aeschlimann 2017-04-25 22:22:24 +02:00
parent 483bd48332
commit c314711026
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
View file

@ -38,8 +38,6 @@ export class ColorThemeData implements IColorTheme {
path?: string;
extensionData: ExtensionData;
colorMap: IColorMap = {};
defaultColorMap: IColorMap = {};
public getColor(colorId: ColorIdentifier, useDefault?: boolean): Color {
let customColor = this.themeService.getCustomColor(colorId);
@ -54,12 +52,7 @@ export class ColorThemeData implements IColorTheme {
}
private getDefault(colorId: ColorIdentifier): Color {
let color = this.defaultColorMap[colorId];
if (types.isUndefined(color)) {
color = colorRegistry.resolveDefaultColor(colorId, this);
this.defaultColorMap[colorId] = color;
}
return color;
return colorRegistry.resolveDefaultColor(colorId, this);
}
public isDefault(colorId: ColorIdentifier): boolean {
@ -75,7 +68,6 @@ export class ColorThemeData implements IColorTheme {
if (!this.isLoaded) {
this.tokenColors = [];
this.colorMap = {};
this.defaultColorMap = {};
if (this.path) {
return _loadColorThemeFromFile(this.path, this.tokenColors, this.colorMap).then(_ => {
this.isLoaded = true;