Merge pull request #152699 from jeanp413/terminal-quickpick-index

Fix terminal quick pick index
microsoft · Jun 21, 2022 · a869e9c · a869e9c
2 parents ebd5e3c + 635bc9e
commit a869e9c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts b/src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts
@@ -39,7 +39,7 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 			const terminalGroup = terminalGroups[groupIndex];
 			for (let terminalIndex = 0; terminalIndex < terminalGroup.terminalInstances.length; terminalIndex++) {
 				const terminal = terminalGroup.terminalInstances[terminalIndex];
-				const pick = this._createPick(terminal, terminalIndex, filter, groupIndex);
+				const pick = this._createPick(terminal, terminalIndex, filter, { groupIndex, groupSize: terminalGroup.terminalInstances.length });
 				if (pick) {
 					terminalPicks.push(pick);
 				}
@@ -79,9 +79,14 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 		return terminalPicks;
 	}
 
-	private _createPick(terminal: ITerminalInstance, terminalIndex: number, filter: string, groupIndex?: number): IPickerQuickAccessItem | undefined {
+	private _createPick(terminal: ITerminalInstance, terminalIndex: number, filter: string, groupInfo?: { groupIndex: number; groupSize: number }): IPickerQuickAccessItem | undefined {
 		const iconId = getIconId(terminal);
-		const label = groupIndex ? `$(${iconId}) ${groupIndex + 1}.${terminalIndex + 1}: ${terminal.title}` : `$(${iconId}) ${terminalIndex + 1}: ${terminal.title}`;
+		const index = groupInfo
+			? (groupInfo.groupSize > 1
+				? `${groupInfo.groupIndex + 1}.${terminalIndex + 1}`
+				: `${groupInfo.groupIndex + 1}`)
+			: `${terminalIndex + 1}`;
+		const label = `$(${iconId}) ${index}: ${terminal.title}`;
 		const iconClasses: string[] = [];
 		const colorClass = getColorClass(terminal);
 		if (colorClass) {