Add setting to disable fast tasks picker

alexr00 · alexr00 · commit 34a9a5e080a0 · 2020-04-24T13:38:55.000+02:00
Fixes microsoft#95358
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -84,6 +84,7 @@ import { isWorkspaceFolder, TaskQuickPickEntry, QUICKOPEN_DETAIL_CONFIG, TaskQui
 
 const QUICKOPEN_HISTORY_LIMIT_CONFIG = 'task.quickOpen.history';
 const PROBLEM_MATCHER_NEVER_CONFIG = 'task.problemMatchers.neverPrompt';
+const USE_SLOW_PICKER = 'task.quickOpen.showAll';
 
 export namespace ConfigureTaskAction {
 	export const ID = 'workbench.action.tasks.configureTaskRunner';
@@ -2255,7 +2256,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		const picker: IQuickPick<TaskQuickPickEntry> = this.quickInputService.createQuickPick();
 		picker.placeholder = placeHolder;
 		picker.matchOnDescription = true;
-		picker.ignoreFocusOut = true;
 
 		picker.onDidTriggerItemButton(context => {
 			let task = context.item.task;
@@ -2367,26 +2367,76 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 	}
 
-	private doRunTaskCommand(tasks?: Task[]): void {
-		this.showIgnoredFoldersMessage().then(() => {
-			this.showTwoLevelQuickPick(
-				nls.localize('TaskService.pickRunTask', 'Select the task to run'),
-				{
-					label: nls.localize('TaskService.noEntryToRun', 'No configured tasks. Configure Tasks...'),
-					task: null
-				}).
-				then((task) => {
-					if (task === undefined) {
-						return;
-					}
-					if (task === null) {
-						this.runConfigureTasks();
-					} else {
-						this.run(task, { attachProblemMatcher: true }, TaskRunSource.User).then(undefined, reason => {
-							// eat the error, it has already been surfaced to the user and we don't care about it here
-						});
+	private tasksAndGroupedTasks(filter?: TaskFilter): { tasks: Promise<Task[]>, grouped: Promise<TaskMap> } {
+		if (!this.versionAndEngineCompatible(filter)) {
+			return { tasks: Promise.resolve<Task[]>([]), grouped: Promise.resolve(new TaskMap()) };
+		}
+		const grouped = this.getGroupedTasks(filter ? filter.type : undefined);
+		const tasks = grouped.then((map) => {
+			if (!filter || !filter.type) {
+				return map.all();
+			}
+			let result: Task[] = [];
+			map.forEach((tasks) => {
+				for (let task of tasks) {
+					if (ContributedTask.is(task) && task.defines.type === filter.type) {
+						result.push(task);
+					} else if (CustomTask.is(task)) {
+						if (task.type === filter.type) {
+							result.push(task);
+						} else {
+							let customizes = task.customizes();
+							if (customizes && customizes.type === filter.type) {
+								result.push(task);
+							}
+						}
 					}
+				}
+			});
+			return result;
+		});
+		return { tasks, grouped };
+	}
+
+	private doRunTaskCommand(tasks?: Task[]): void {
+		const pickThen = (task: Task | undefined | null) => {
+			if (task === undefined) {
+				return;
+			}
+			if (task === null) {
+				this.runConfigureTasks();
+			} else {
+				this.run(task, { attachProblemMatcher: true }, TaskRunSource.User).then(undefined, reason => {
+					// eat the error, it has already been surfaced to the user and we don't care about it here
 				});
+			}
+		};
+
+		const placeholder = nls.localize('TaskService.pickRunTask', 'Select the task to run');
+
+		this.showIgnoredFoldersMessage().then(() => {
+			if (this.configurationService.getValue(USE_SLOW_PICKER)) {
+				let taskResult: { tasks: Promise<Task[]>, grouped: Promise<TaskMap> } | undefined = undefined;
+				if (!tasks) {
+					taskResult = this.tasksAndGroupedTasks();
+				}
+				this.showQuickPick(tasks ? tasks : taskResult!.tasks, placeholder,
+					{
+						label: nls.localize('TaskService.noEntryToRunSlow', 'No task to run found. Configure Tasks...'),
+						task: null
+					},
+					true).
+					then((entry) => {
+						return pickThen(entry ? entry.task : undefined);
+					});
+			} else {
+				this.showTwoLevelQuickPick(placeholder,
+					{
+						label: nls.localize('TaskService.noEntryToRun', 'No configured tasks. Configure Tasks...'),
+						task: null
+					}).
+					then(pickThen);
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -377,6 +377,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('task.quickOpen.skip', "Controls whether the task quick pick is skipped when there is only one task to pick from."),
 			default: false
 		},
+		'task.quickOpen.showAll': {
+			type: 'boolean',
+			description: nls.localize('task.quickOpen.showAll', "Causes the Tasks: Run Task command to use the slower \"show all\" behavior instead of the faster two level picker where tasks are grouped by provider."),
+			default: false
+		},
 		'task.saveBeforeRun': {
 			markdownDescription: nls.localize(
 				'task.saveBeforeRun',
