maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve task numbering for task quick picks

Browse source 
Fixes #91440
This commit is contained in:
Alex Ross 2021-11-12 16:17:14 +01:00
parent b1dc0b0ebf
commit 2be31eebb1
No known key found for this signature in database
GPG key ID: 89DDDBA66CBA7840
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View file

@ -2277,19 +2277,22 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
private async createTaskQuickPickEntries(tasks: Task[], group: boolean = false, sort: boolean = false, selectedEntry?: TaskQuickPickEntry, includeRecents: boolean = true): Promise<TaskQuickPickEntry[]> {
let count: { [key: string]: number; } = {};
let encounteredTasks: { [key: string]: TaskQuickPickEntry[] } = {};
if (tasks === undefined || tasks === null || tasks.length === 0) {
return [];
}
const TaskQuickPickEntry = (task: Task): TaskQuickPickEntry => {
let entryLabel = task._label;
if (count[task._id]) {
entryLabel = entryLabel + ' (' + count[task._id].toString() + ')';
count[task._id]++;
const newEntry = { label: task._label, description: this.getTaskDescription(task), task, detail: this.showDetail() ? task.configurationProperties.detail : undefined };
if (encounteredTasks[task._id]) {
if (encounteredTasks[task._id].length === 1) {
encounteredTasks[task._id][0].label += ' (1)';
}
newEntry.label = newEntry.label + ' (' + (encounteredTasks[task._id].length + 1).toString() + ')';
} else {
count[task._id] = 1;
encounteredTasks[task._id] = [];
}
return { label: entryLabel, description: this.getTaskDescription(task), task, detail: this.showDetail() ? task.configurationProperties.detail : undefined };
encounteredTasks[task._id].push(newEntry);
return newEntry;
};
function fillEntries(entries: QuickPickInput<TaskQuickPickEntry>[], tasks: Task[], groupLabel: string): void {
@ -2360,7 +2363,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
entries = tasks.map<TaskQuickPickEntry>(task => TaskQuickPickEntry(task));
}
count = {};
encounteredTasks = {};
return entries;
}