fix microsoft#141159 (microsoft#143909)

Author: meganrogge

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

@@ -296,7 +296,9 @@ export class TerminalService implements ITerminalService {
 			this._onDidFocusInstance.fire(instance);
 			this._evaluateActiveInstance(host, instance);
 		});
-		host.onDidChangeInstanceCapability(this._onDidChangeInstanceCapability.fire, this.onDidChangeInstanceCapability);
+		host.onDidChangeInstanceCapability((instance) => {
+			this._onDidChangeInstanceCapability.fire(instance);
+		});
 		this._hostActiveTerminals.set(host, undefined);
 	}
 

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

@@ -46,7 +46,7 @@ import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecy
 import { IProcessDetails } from 'vs/platform/terminal/common/terminalProcess';
 import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
 import { getTerminalResourcesFromDragEvent, parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
-import { TerminalCapability } from 'vs/workbench/contrib/terminal/common/capabilities/capabilities';
+import { getShellIntegrationTooltip } from 'vs/workbench/contrib/terminal/browser/terminalTooltip';
 
 const $ = DOM.$;
 
@@ -308,21 +308,7 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
 			}
 		}
 
-		let shellIntegrationString = '';
-		const shellIntegrationCapabilities: TerminalCapability[] = [];
-		if (instance.capabilities.has(TerminalCapability.CommandDetection)) {
-			shellIntegrationCapabilities.push(TerminalCapability.CommandDetection);
-		}
-		if (instance.capabilities.has(TerminalCapability.CwdDetection)) {
-			shellIntegrationCapabilities.push(TerminalCapability.CwdDetection);
-		}
-		if (shellIntegrationCapabilities.length > 0) {
-			shellIntegrationString += `\n\n---\n\n ${localize('shellIntegration.enabled', "Shell integration is enabled")}`;
-			for (const capability of shellIntegrationCapabilities) {
-				shellIntegrationString += `\n- ${this._getCapabilityName(capability)}`;
-			}
-		}
-
+		const shellIntegrationString = getShellIntegrationTooltip(instance, true);
 		const iconId = getIconId(instance);
 		const hasActionbar = !this.shouldHideActionBar();
 		let label: string = '';
@@ -514,18 +500,6 @@ class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminal
 		this._terminalGroupService.focusTabs();
 		this._listService.lastFocusedList?.focusNext();
 	}
-
-	private _getCapabilityName(capability: TerminalCapability): string | undefined {
-		switch (capability) {
-			case TerminalCapability.CwdDetection:
-			case TerminalCapability.NaiveCwdDetection:
-				return localize('capability.cwdDetection', "Current working directory detection");
-			case TerminalCapability.CommandDetection:
-				return localize('capability.commandDetection', "Command detection");
-			case TerminalCapability.PartialCommandDetection:
-				return localize('capability.partialCommandDetection', "Command detection (partial)");
-		}
-	}
 }
 
 interface ITerminalTabEntryTemplate {

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

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { TerminalCapability } from 'vs/workbench/contrib/terminal/common/capabilities/capabilities';
+
+function getCapabilityName(capability: TerminalCapability): string | undefined {
+	switch (capability) {
+		case TerminalCapability.CwdDetection:
+		case TerminalCapability.NaiveCwdDetection:
+			return localize('capability.cwdDetection', "Current working directory detection");
+		case TerminalCapability.CommandDetection:
+			return localize('capability.commandDetection', "Command detection");
+		case TerminalCapability.PartialCommandDetection:
+			return localize('capability.partialCommandDetection', "Command detection (partial)");
+	}
+}
+
+export function getShellIntegrationTooltip(instance: ITerminalInstance, markdown?: boolean): string {
+	let shellIntegrationString = '';
+	const shellIntegrationCapabilities: TerminalCapability[] = [];
+	if (instance.capabilities.has(TerminalCapability.CommandDetection)) {
+		shellIntegrationCapabilities.push(TerminalCapability.CommandDetection);
+	}
+	if (instance.capabilities.has(TerminalCapability.CwdDetection)) {
+		shellIntegrationCapabilities.push(TerminalCapability.CwdDetection);
+	}
+	if (shellIntegrationCapabilities.length > 0) {
+		shellIntegrationString += `${markdown ? '\n\n---\n\n' : '\n\n'} ${localize('shellIntegration.enabled', "Shell integration is enabled")}`;
+		for (const capability of shellIntegrationCapabilities) {
+			shellIntegrationString += `\n- ${getCapabilityName(capability)}`;
+		}
+	}
+	return shellIntegrationString;
+}

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

@@ -45,6 +45,7 @@ import { withNullAsUndefined } from 'vs/base/common/types';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { getTerminalActionBarArgs } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
 import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
+import { getShellIntegrationTooltip } from 'vs/workbench/contrib/terminal/browser/terminalTooltip';
 
 export class TerminalViewPane extends ViewPane {
 	private _actions: IAction[] | undefined;
@@ -391,6 +392,10 @@ class SingleTerminalTabActionViewItem extends MenuEntryActionViewItem {
 				this.updateLabel();
 			}
 		}));
+		this._register(this._terminalService.onDidChangeInstanceCapability(e => {
+			this._action.tooltip = getSingleTabTooltip(e, this._terminalService.configHelper.config.tabs.separator);
+			this.updateLabel(e);
+		}));
 
 		// Clean up on dispose
 		this._register(toDisposable(() => dispose(this._elementDisposables)));
@@ -504,7 +509,7 @@ function getSingleTabLabel(instance: ITerminalInstance | undefined, separator: s
 		return '';
 	}
 	let iconClass = ThemeIcon.isThemeIcon(instance.icon) ? instance.icon?.id : Codicon.terminal.id;
-	const label = `$(${icon?.id || iconClass}) ${getSingleTabTooltip(instance, separator)}`;
+	const label = `$(${icon?.id || iconClass}) ${getSingleTabTitle(instance, separator)}`;
 
 	const primaryStatus = instance.statusList.primary;
 	if (!primaryStatus?.icon) {
@@ -517,10 +522,16 @@ function getSingleTabTooltip(instance: ITerminalInstance | undefined, separator:
 	if (!instance) {
 		return '';
 	}
-	if (!instance.description) {
-		return instance.title;
+	const shellIntegrationString = getShellIntegrationTooltip(instance);
+	const title = getSingleTabTitle(instance, separator);
+	return shellIntegrationString ? title + shellIntegrationString : title;
+}
+
+function getSingleTabTitle(instance: ITerminalInstance | undefined, separator: string): string {
+	if (!instance) {
+		return '';
 	}
-	return `${instance.title} ${separator} ${instance.description}`;
+	return !instance.description ? instance.title : `${instance.title} ${separator} ${instance.description}`;
 }
 
 class TerminalThemeIconStyle extends Themable {