Merge pull request microsoft#154355 from microsoft/tyriar/154354

Polish default terminal tab icon/color settings

Author: Tyriar

src/vs/platform/terminal/common/terminal.ts

@@ -40,8 +40,8 @@ export const enum TerminalSettingId {
 	DefaultProfileMacOs = 'terminal.integrated.defaultProfile.osx',
 	DefaultProfileWindows = 'terminal.integrated.defaultProfile.windows',
 	UseWslProfiles = 'terminal.integrated.useWslProfiles',
-	TabsDefaultIconColor = 'terminal.integrated.tabs.defaultIconColor',
-	TabsDefaultIconId = 'terminal.integrated.tabs.defaultIconId',
+	TabsDefaultColor = 'terminal.integrated.tabs.defaultColor',
+	TabsDefaultIcon = 'terminal.integrated.tabs.defaultIcon',
 	TabsEnabled = 'terminal.integrated.tabs.enabled',
 	TabsEnableAnimation = 'terminal.integrated.tabs.enableAnimation',
 	TabsHideCondition = 'terminal.integrated.tabs.hideCondition',

src/vs/platform/terminal/common/terminalPlatformConfiguration.ts

@@ -46,11 +46,11 @@ const terminalProfileBaseProperties: IJSONSchemaMap = {
 		type: 'boolean'
 	},
 	icon: {
-		description: localize('terminalProfile.icon', 'A codicon ID to associate with this terminal.'),
+		description: localize('terminalProfile.icon', 'A codicon ID to associate with the terminal icon.'),
 		...terminalIconSchema
 	},
 	color: {
-		description: localize('terminalProfile.color', 'A theme color ID to associate with this terminal.'),
+		description: localize('terminalProfile.color', 'A theme color ID to associate with the terminal icon.'),
 		...terminalColorSchema
 	},
 	env: {

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -550,7 +550,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _getIcon(): TerminalIcon | undefined {
 		if (!this._icon) {
 			this._icon = this._processManager.processState >= ProcessState.Launching
-				? getIconRegistry().getIcon(this._configurationService.getValue(TerminalSettingId.TabsDefaultIconId))
+				? getIconRegistry().getIcon(this._configurationService.getValue(TerminalSettingId.TabsDefaultIcon))
 				: undefined;
 		}
 		return this._icon;

src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts

@@ -117,7 +117,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 	}
 
 	getDefaultIcon(): TerminalIcon & ThemeIcon {
-		return this._iconRegistry.getIcon(this._configurationService.getValue(TerminalSettingId.TabsDefaultIconId)) || Codicon.terminal;
+		return this._iconRegistry.getIcon(this._configurationService.getValue(TerminalSettingId.TabsDefaultIcon)) || Codicon.terminal;
 	}
 
 	async resolveShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig, options: IShellLaunchConfigResolveOptions): Promise<void> {
@@ -157,7 +157,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 		// Apply the color
 		shellLaunchConfig.color = shellLaunchConfig.color
 			|| resolvedProfile.color
-			|| this._configurationService.getValue(TerminalSettingId.TabsDefaultIconColor);
+			|| this._configurationService.getValue(TerminalSettingId.TabsDefaultColor);
 
 		// Resolve useShellEnvironment based on the setting if it's not set
 		if (shellLaunchConfig.useShellEnvironment === undefined) {

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

@@ -40,12 +40,12 @@ const terminalConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: false
 		},
-		[TerminalSettingId.TabsDefaultIconColor]: {
-			description: localize('terminal.integrated.tabs.defaultIconColor', "A theme color ID to associate with terminals by default."),
+		[TerminalSettingId.TabsDefaultColor]: {
+			description: localize('terminal.integrated.tabs.defaultColor', "A theme color ID to associate with terminal icons by default."),
 			...terminalColorSchema
 		},
-		[TerminalSettingId.TabsDefaultIconId]: {
-			description: localize('terminal.integrated.tabs.defaultIconId', "A codicon ID to associate with terminals by default."),
+		[TerminalSettingId.TabsDefaultIcon]: {
+			description: localize('terminal.integrated.tabs.defaultIcon', "A codicon ID to associate with terminal icons by default."),
 			...terminalIconSchema,
 			default: Codicon.terminal.id,
 		},