Fire group service instance change event when switching

Fixes #127343
microsoft · Jun 28, 2021 · 8ab8d2a · 8ab8d2a
1 parent 1b68832
commit 8ab8d2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
@@ -288,14 +288,15 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		}
 
 		this.activeInstanceIndex = instanceLocation.instanceIndex;
-		this.activeGroupIndex = instanceLocation.groupIndex;
 
 		if (this.activeGroupIndex !== instanceLocation.groupIndex) {
+			this.activeGroupIndex = instanceLocation.groupIndex;
 			this._onDidChangeActiveGroup.fire(this.activeGroup);
 		}
 		this.groups.forEach((g, i) => g.setVisible(i === instanceLocation.groupIndex));
 
 		instanceLocation.group.setActiveInstanceByIndex(this.activeInstanceIndex);
+		this._onDidChangeActiveInstance.fire(newActiveInstance);
 	}
 
 	setActiveGroupToNext() {

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -435,6 +435,7 @@ class SingleTerminalTabActionViewItem extends MenuEntryActionViewItem {
 		this._register(this._terminalService.onInstancePrimaryStatusChanged(e => this.updateLabel(e)));
 		this._register(_terminalGroupService.onDidChangeActiveInstance(() => this.updateLabel()));
 		this._register(this._terminalService.onInstanceIconChanged(e => this.updateLabel(e)));
+		this._register(this._terminalService.onInstanceColorChanged(e => this.updateLabel(e)));
 		this._register(this._terminalService.onInstanceTitleChanged(e => {
 			if (e === this._terminalGroupService.activeInstance) {
 				this._action.tooltip = getSingleTabTooltip(e);