Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix terminal quick pick index #152699

Merged
merged 2 commits into from
Jun 21, 2022
Merged

Fix terminal quick pick index #152699

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5761e83
Fix terminal quick pick index
jeanp413 Jun 21, 2022
635bc9e
Merge branch 'main' into terminal-quickpick-index
Tyriar Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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) {
Expand Down