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

aeschli · aeschli · commit e1f09b528cd9 · 2019-10-09T17:44:05.000+02:00
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -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 });
diff --git a/src/vs/workbench/services/themes/common/colorThemeStore.ts b/src/vs/workbench/services/themes/common/colorThemeStore.ts
@@ -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);
 		});
 	}
 
