Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-13 13:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[themes] Disabling default themes results in empty label name. Fixes #56702

Browse Source
This commit is contained in:
Martin Aeschlimann
2019-10-09 17:44:05 +02:00
parent b73f9ec854
commit e1f09b528c
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+1 -1
View File
@@ -102,7 +102,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
) {
this.container = layoutService.getWorkbenchContainer();
this.colorThemeStore = new ColorThemeStore(extensionService, ColorThemeData.createLoadedEmptyTheme(DEFAULT_THEME_ID, DEFAULT_THEME_SETTING_VALUE));
this.colorThemeStore = new ColorThemeStore(extensionService);
this.onFileIconThemeChange = new Emitter<IFileIconTheme>();
this.iconThemeStore = new FileIconThemeStore(extensionService);
this.onColorThemeChange = new Emitter<IColorTheme>({ leakWarningThreshold: 400 });
src/vs/workbench/services/themes/common/colorThemeStore.ts
+4 -8
View File
@@ -57,8 +57,8 @@ export class ColorThemeStore {
private readonly onDidChangeEmitter = new Emitter<ColorThemeChangeEvent>();
public readonly onDidChange: Event<ColorThemeChangeEvent> = this.onDidChangeEmitter.event;
constructor(@IExtensionService private readonly extensionService: IExtensionService, defaultTheme: ColorThemeData) {
this.extensionsColorThemes = [defaultTheme];
constructor(@IExtensionService private readonly extensionService: IExtensionService) {
this.extensionsColorThemes = [];
this.initialize();
}
@@ -69,7 +69,7 @@ export class ColorThemeStore {
for (const theme of this.extensionsColorThemes) {
previousIds[theme.id] = true;
}
this.extensionsColorThemes.length = 1; // remove all but the default theme
this.extensionsColorThemes.length = 0;
for (let ext of extensions) {
let extensionData = {
extensionId: ext.description.identifier.value,
@@ -114,11 +114,7 @@ export class ColorThemeStore {
}
let themeData = ColorThemeData.fromExtensionTheme(theme, colorThemeLocation, extensionData);
if (themeData.id === this.extensionsColorThemes[0].id) {
this.extensionsColorThemes[0] = themeData;
} else {
this.extensionsColorThemes.push(themeData);
}
this.extensionsColorThemes.push(themeData);
});
}