fix #25426

extensions/theme-abyss/themes/abyss-color-theme.json

@@ -357,12 +357,12 @@
 		// Workbench: Tabs
 		"tabsContainerBackground": "#1c1c2a",
 		"tabBorder": "#2b2b4a",
-		// "activeTabBackground": "",
-		"inactiveTabBackground": "#10192c",
-		// "activeTabActiveGroupForeground": "",
-		// "activeTabInactiveGroupForeground": "",
-		// "inactiveTabActiveGroupForeground": "",
-		// "inactiveTabInactiveGroupForeground": "",
+		// "tabActiveBackground": "",
+		"tabInactiveBackground": "#10192c",
+		// "tabActiveEditorGroupActiveForeground": "",
+		// "tabActiveEditorGroupInactiveForeground": "",
+		// "tabInactiveEditorGroupActiveForeground": "",
+		// "tabInactiveEditorGroupInactiveForeground": "",
 
 		// Workbench: Activity Bar
 		"activityBarBackground": "#051336",

extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json

@@ -9,7 +9,7 @@
 		"editorWidgetBackground": "#131510",
 		"editorHoverBackground": "#221a14",
 		"tabsContainerBackground": "#131510",
-		"inactiveTabBackground": "#131510",
+		"tabInactiveBackground": "#131510",
 		"statusBarBackground": "#162257",
 		"activityBarBackground": "#221a0f",
 		"activityBarForeground": "#d3af86",

extensions/theme-red/themes/Red-color-theme.json

@@ -4,8 +4,8 @@
 		// window
 		"activityBarBadgeBackground": "#DB7E58",
 		"activityBarBackground": "#580000",
-		"inactiveTabBackground": "#300a0a",
-		"activeTabBackground": "#490000",
+		"tabInactiveBackground": "#300a0a",
+		"tabActiveBackground": "#490000",
 		"sideBarBackground": "#330000",
 		"statusBarBackground": "#700000",
 		"tabsContainerBackground": "#330000",

extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json

@@ -393,14 +393,14 @@
 		"editorDragAndDropBackground": "#00212BAA",
 
 		// Workbench: Tabs
-		"activeTabActiveGroupForeground": "#d6dbdb",
-		"activeTabBackground": "#002B37",
-		"inactiveTabActiveGroupForeground": "#93A1A1",
-		"inactiveTabBackground": "#004052",
+		"tabActiveEditorGroupActiveForeground": "#d6dbdb",
+		"tabActiveBackground": "#002B37",
+		"tabInactiveEditorGroupActiveForeground": "#93A1A1",
+		"tabInactiveBackground": "#004052",
 		"tabsContainerBackground": "#004052",
 		"tabBorder": "#003847",
-		"activeTabInactiveGroupForeground": "#93A1A1",
-		"inactiveTabInactiveGroupForeground": "#93A1A1",
+		"tabActiveEditorGroupInactiveForeground": "#93A1A1",
+		"tabInactiveEditorGroupInactiveForeground": "#93A1A1",
 
 		// Workbench: Activity Bar
 		"activityBarBackground": "#003847",

extensions/theme-solarized-light/themes/solarized-light-color-theme.json

@@ -315,14 +315,14 @@
 		"statusBarBackground": "#EEE8D5",
 		"statusBarDebuggingBackground": "#EEE8D5",
 		"statusBarNoFolderBackground": "#EEE8D5",
-		// "activeTabActiveGroupForeground": "#d6dbdb",
-		"activeTabBackground": "#FDF6E3",
-		"inactiveTabActiveGroupForeground": "#586E75",
-		"inactiveTabBackground": "#CCC4B0",
+		// "tabActiveEditorGroupActiveForeground": "#d6dbdb",
+		"tabActiveBackground": "#FDF6E3",
+		"tabInactiveEditorGroupActiveForeground": "#586E75",
+		"tabInactiveBackground": "#CCC4B0",
 		"tabsContainerBackground": "#CCC4B0",
 		"tabBorder": "#DDD6C1",
-		// "activeTabInactiveGroupForeground": "#586E75",
-		// "inactiveTabInactiveGroupForeground": "#586E75",
+		// "tabActiveEditorGroupInactiveForeground": "#586E75",
+		// "tabInactiveEditorGroupInactiveForeground": "#586E75",
 		"debugToolBarBackground": "#EEE8D5",
 		"dropdownBackground": "#EEE8D5",
 		"dropdownBorder": "#2AA19899",

extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json

@@ -18,7 +18,7 @@
 		"editorCursor": "#ffffff",
 		"editorWhitespaces": "#404f7d",
 		"tabsContainerBackground": "#001733",
-		"inactiveTabBackground": "#001c40",
+		"tabInactiveBackground": "#001c40",
 		"statusBarBackground": "#001126",
 		"statusBarNoFolderBackground": "#001126",
 		"activityBarBackground": "#001733",

src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts

@@ -12,7 +12,7 @@ import DOM = require('vs/base/browser/dom');
 import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { EditorLabel } from 'vs/workbench/browser/labels';
 import { Verbosity } from 'vs/platform/editor/common/editor';
-import { ACTIVE_TAB_INACTIVE_GROUP_FOREGROUND, ACTIVE_TAB_ACTIVE_GROUP_FOREGROUND } from 'vs/workbench/common/theme';
+import { TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND, TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
 
 export class NoTabsTitleControl extends TitleControl {
 	private titleContainer: HTMLElement;
@@ -127,9 +127,9 @@ export class NoTabsTitleControl extends TitleControl {
 
 		this.editorLabel.setLabel({ name, description, resource }, { title, italic: !isPinned, extraClasses: ['title-label'] });
 		if (isActive) {
-			this.editorLabel.element.style.color = this.getColor(ACTIVE_TAB_ACTIVE_GROUP_FOREGROUND);
+			this.editorLabel.element.style.color = this.getColor(TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND);
 		} else {
-			this.editorLabel.element.style.color = this.getColor(ACTIVE_TAB_INACTIVE_GROUP_FOREGROUND);
+			this.editorLabel.element.style.color = this.getColor(TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND);
 		}
 
 		// Update Editor Actions Toolbar

src/vs/workbench/browser/parts/editor/tabsTitleControl.ts

@@ -40,7 +40,7 @@ import { LinkedMap } from 'vs/base/common/map';
 import { DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/editorService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import { INACTIVE_TAB_BACKGROUND, ACTIVE_TAB_BACKGROUND, ACTIVE_TAB_ACTIVE_GROUP_FOREGROUND, ACTIVE_TAB_INACTIVE_GROUP_FOREGROUND, INACTIVE_TAB_ACTIVE_GROUP_FOREGROUND, INACTIVE_TAB_INACTIVE_GROUP_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
+import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND, TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND, TAB_INACTIVE_GROUP_ACTIVE_FOREGROUND, TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 import { highContrastOutline } from 'vs/platform/theme/common/colorRegistry';
 
 interface IEditorInputLabel {
@@ -215,7 +215,7 @@ export class TabsTitleControl extends TitleControl {
 		const isActiveTab = isTab && this.context.isActive(this.context.getEditor(index));
 
 		// Background
-		const noDNDBackgroundColor = isTab ? this.getColor(isActiveTab ? ACTIVE_TAB_BACKGROUND : INACTIVE_TAB_BACKGROUND) : null;
+		const noDNDBackgroundColor = isTab ? this.getColor(isActiveTab ? TAB_ACTIVE_BACKGROUND : TAB_INACTIVE_BACKGROUND) : null;
 		element.style.backgroundColor = isDND ? this.getColor(EDITOR_DRAG_AND_DROP_BACKGROUND) : noDNDBackgroundColor;
 
 		// Outline
@@ -290,15 +290,15 @@ export class TabsTitleControl extends TitleControl {
 				if (isTabActive) {
 					DOM.addClass(tabContainer, 'active');
 					tabContainer.setAttribute('aria-selected', 'true');
-					tabContainer.style.backgroundColor = this.getColor(ACTIVE_TAB_BACKGROUND);
-					tabLabel.element.style.color = this.getColor(isGroupActive ? ACTIVE_TAB_ACTIVE_GROUP_FOREGROUND : ACTIVE_TAB_INACTIVE_GROUP_FOREGROUND);
+					tabContainer.style.backgroundColor = this.getColor(TAB_ACTIVE_BACKGROUND);
+					tabLabel.element.style.color = this.getColor(isGroupActive ? TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND : TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND);
 
 					this.activeTab = tabContainer;
 				} else {
 					DOM.removeClass(tabContainer, 'active');
 					tabContainer.setAttribute('aria-selected', 'false');
-					tabContainer.style.backgroundColor = this.getColor(INACTIVE_TAB_BACKGROUND);
-					tabLabel.element.style.color = this.getColor(isGroupActive ? INACTIVE_TAB_ACTIVE_GROUP_FOREGROUND : INACTIVE_TAB_INACTIVE_GROUP_FOREGROUND);
+					tabContainer.style.backgroundColor = this.getColor(TAB_INACTIVE_BACKGROUND);
+					tabLabel.element.style.color = this.getColor(isGroupActive ? TAB_INACTIVE_GROUP_ACTIVE_FOREGROUND : TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND);
 				}
 
 				// Dirty State

src/vs/workbench/common/theme.ts

@@ -17,47 +17,47 @@ export const TABS_CONTAINER_BACKGROUND = registerColor('tabsContainerBackground'
 	hc: null
 }, nls.localize('tabsContainerBackground', "Background color of the tabs container. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const ACTIVE_TAB_BACKGROUND = registerColor('activeTabBackground', {
+export const TAB_ACTIVE_BACKGROUND = registerColor('tabActiveBackground', {
 	dark: editorBackground,
 	light: editorBackground,
 	hc: editorBackground
-}, nls.localize('activeTabBackground', "Active tab background color. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabActiveBackground', "Active tab background color. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const INACTIVE_TAB_BACKGROUND = registerColor('inactiveTabBackground', {
+export const TAB_INACTIVE_BACKGROUND = registerColor('tabInactiveBackground', {
 	dark: '#2D2D2D',
 	light: '#ECECEC',
 	hc: null
-}, nls.localize('inactiveTabBackground', "Inactive tab background color. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabInactiveBackground', "Inactive tab background color. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const ACTIVE_TAB_ACTIVE_GROUP_FOREGROUND = registerColor('activeTabActiveGroupForeground', {
+export const TAB_BORDER = registerColor('tabBorder', {
+	dark: '#252526',
+	light: '#F3F3F3',
+	hc: highContrastBorder
+}, nls.localize('tabBorder', "Border to separate tabs from each other. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+
+export const TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND = registerColor('tabActiveEditorGroupActiveForeground', {
 	dark: Color.white,
 	light: Color.fromRGBA(new RGBA(51, 51, 51)),
 	hc: Color.white
-}, nls.localize('activeTabActiveGroupForeground', "Active tab foreground color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabActiveEditorGroupActiveForeground', "Active tab foreground color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const ACTIVE_TAB_INACTIVE_GROUP_FOREGROUND = registerColor('activeTabInactiveGroupForeground', {
+export const TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tabActiveEditorGroupInactiveForeground', {
 	dark: Color.white.transparent(0.5),
 	light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.7),
 	hc: Color.white
-}, nls.localize('activeTabInactiveGroupForeground', "Active tab foreground color in an inactive group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabActiveEditorGroupInactiveForeground', "Active tab foreground color in an inactive group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const INACTIVE_TAB_ACTIVE_GROUP_FOREGROUND = registerColor('inactiveTabActiveGroupForeground', {
+export const TAB_INACTIVE_GROUP_ACTIVE_FOREGROUND = registerColor('tabInactiveEditorGroupActiveForeground', {
 	dark: Color.white.transparent(0.5),
 	light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.5),
 	hc: Color.white
-}, nls.localize('inactiveTabActiveGroupForeground', "Inactive tab foreground color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabInactiveEditorGroupActiveForeground', "Inactive tab foreground color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
 
-export const INACTIVE_TAB_INACTIVE_GROUP_FOREGROUND = registerColor('inactiveTabInactiveGroupForeground', {
+export const TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tabInactiveEditorGroupInactiveForeground', {
 	dark: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.5).transparent(0.5),
 	light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.5).transparent(0.7),
 	hc: Color.white
-}, nls.localize('inactiveTabInactiveGroupForeground', "Inactive tab foreground color in an inactive group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
-
-export const TAB_BORDER = registerColor('tabBorder', {
-	dark: '#252526',
-	light: '#F3F3F3',
-	hc: highContrastBorder
-}, nls.localize('tabBorder', "Border to separate tabs from each other. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
+}, nls.localize('tabInactiveEditorGroupInactiveForeground', "Inactive tab foreground color in an inactive group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));