Contributed tasks aren't added to recent (microsoft#94549)

alexr00 · web-flow · commit ea935488ec0e · 2020-04-07T13:42:53.000+02:00
Fixes microsoft#94547
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -761,11 +761,30 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 	}
 
-	private setRecentlyUsedTask(task: Task): void {
-		const key = task.getRecentlyUsedKey();
+	private async setRecentlyUsedTask(task: Task): Promise<void> {
+		let key = task.getRecentlyUsedKey();
 		if (!InMemoryTask.is(task) && key) {
-			this.getRecentlyUsedTasks().set(key, JSON.stringify(this.createCustomizableTask(task)));
-			this.saveRecentlyUsedTasks();
+			const customizations = this.createCustomizableTask(task);
+			if (ContributedTask.is(task) && customizations) {
+				// reset the key so we can ignore this task if we can't make a new key for it
+				key = undefined;
+				let custom: CustomTask[] = [];
+				let customized: IStringDictionary<ConfiguringTask> = Object.create(null);
+				await this.computeTasksForSingleConfig(task._source.workspaceFolder ?? this.workspaceFolders[0], {
+					version: '2.0.0',
+					tasks: [customizations]
+				}, TaskRunSource.System, custom, customized, TaskConfig.TaskConfigSource.TasksJson, true);
+				for (const configuration in customized) {
+					// There should only be one configuration in customized, but check that it matches the original task just to be sure.
+					if (customized[configuration].configures._key === task.defines._key) {
+						key = customized[configuration].getRecentlyUsedKey()!;
+					}
+				}
+			}
+			if (key) {
+				this.getRecentlyUsedTasks().set(key, JSON.stringify(customizations));
+				this.saveRecentlyUsedTasks();
+			}
 		}
 	}
 
@@ -1398,15 +1417,15 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		});
 	}
 
-	private handleExecuteResult(executeResult: ITaskExecuteResult): Promise<ITaskSummary> {
+	private async handleExecuteResult(executeResult: ITaskExecuteResult): Promise<ITaskSummary> {
 		if (executeResult.task.taskLoadMessages && executeResult.task.taskLoadMessages.length > 0) {
 			executeResult.task.taskLoadMessages.forEach(loadMessage => {
 				this._outputChannel.append(loadMessage + '\n');
 			});
 			this.showOutput();
 		}
 
-		this.setRecentlyUsedTask(executeResult.task);
+		await this.setRecentlyUsedTask(executeResult.task);
 		if (executeResult.kind === TaskExecuteKind.Active) {
 			let active = executeResult.active;
 			if (active && active.same) {
@@ -1644,7 +1663,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 				await Promise.all(customTasksPromises);
 				if (needsRecentTasksMigration) {
 					// At this point we have all the tasks and can migrate the recently used tasks.
-					this.migrateRecentTasks(result.all());
+					await this.migrateRecentTasks(result.all());
 				}
 				return result;
 			}, () => {
@@ -2244,7 +2263,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return (this.getRecentlyUsedTasksV1().size > 0) && (this.getRecentlyUsedTasks().size === 0);
 	}
 
-	public migrateRecentTasks(tasks: Task[]) {
+	public async migrateRecentTasks(tasks: Task[]) {
 		if (!this.needsRecentTasksMigration()) {
 			return;
 		}
@@ -2256,12 +2275,13 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 				taskMap[key] = task;
 			}
 		});
-		recentlyUsedTasks.keys().reverse().forEach(key => {
+		const reversed = recentlyUsedTasks.keys().reverse();
+		for (const key in reversed) {
 			let task = taskMap[key];
 			if (task) {
-				this.setRecentlyUsedTask(task);
+				await this.setRecentlyUsedTask(task);
 			}
-		});
+		}
 		this.storageService.remove(AbstractTaskService.RecentlyUsedTasks_Key, StorageScope.WORKSPACE);
 	}
 
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -79,7 +79,7 @@ export interface ITaskService {
 	tryResolveTask(configuringTask: ConfiguringTask): Promise<Task | undefined>;
 	getTasksForGroup(group: string): Promise<Task[]>;
 	getRecentlyUsedTasks(): LinkedMap<string, string>;
-	migrateRecentTasks(tasks: Task[]): void;
+	migrateRecentTasks(tasks: Task[]): Promise<void>;
 	createSorter(): TaskSorter;
 
 	getTaskDescription(task: Task | ConfiguringTask): string | undefined;
