fix microsoft#82610

sandy081 · sandy081 · commit 8b351dbcf789 · 2019-11-26T16:26:55.000+01:00
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -1359,7 +1359,7 @@ export class SetColorThemeAction extends ExtensionAction {
 			return;
 		}
 		let extensionThemes = SetColorThemeAction.getColorThemes(this.colorThemes, this.extension!);
-		const currentTheme = this.colorThemes.filter(t => t.settingsId === this.configurationService.getValue(COLOR_THEME_SETTING))[0];
+		const currentTheme = this.colorThemes.filter(t => t.settingsId === this.configurationService.getValue(COLOR_THEME_SETTING))[0] || this.workbenchThemeService.getColorTheme();
 		showCurrentTheme = showCurrentTheme || extensionThemes.some(t => t.id === currentTheme.id);
 		if (showCurrentTheme) {
 			extensionThemes = extensionThemes.filter(t => t.id !== currentTheme.id);

Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ export class SetColorThemeAction extends ExtensionAction {`
`1359`	`1359`	`return;`
`1360`	`1360`	`}`
`1361`	`1361`	`let extensionThemes = SetColorThemeAction.getColorThemes(this.colorThemes, this.extension!);`
`1362`		`- const currentTheme = this.colorThemes.filter(t => t.settingsId === this.configurationService.getValue(COLOR_THEME_SETTING))[0];`
	`1362`	`+ const currentTheme = this.colorThemes.filter(t => t.settingsId === this.configurationService.getValue(COLOR_THEME_SETTING))[0] \|\| this.workbenchThemeService.getColorTheme();`
`1363`	`1363`	`showCurrentTheme = showCurrentTheme \|\| extensionThemes.some(t => t.id === currentTheme.id);`
`1364`	`1364`	`if (showCurrentTheme) {`
`1365`	`1365`	`extensionThemes = extensionThemes.filter(t => t.id !== currentTheme.id);`