Fix task recents for contributed tasks (microsoft#96569)

alexr00 · web-flow · commit a696eb51a3fb · 2020-04-29T14:13:04.000+02:00
Fixes microsoft#95814
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -2139,7 +2139,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return this.configurationService.getValue<boolean>(QUICKOPEN_DETAIL_CONFIG);
 	}
 
-	private createTaskQuickPickEntries(tasks: Task[], group: boolean = false, sort: boolean = false, selectedEntry?: TaskQuickPickEntry, includeRecents: boolean = true): TaskQuickPickEntry[] {
+	private async createTaskQuickPickEntries(tasks: Task[], group: boolean = false, sort: boolean = false, selectedEntry?: TaskQuickPickEntry, includeRecents: boolean = true): Promise<TaskQuickPickEntry[]> {
 		let count: { [key: string]: number; } = {};
 		if (tasks === undefined || tasks === null || tasks.length === 0) {
 			return [];
@@ -2175,26 +2175,31 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			if (tasks.length === 1) {
 				entries.push(TaskQuickPickEntry(tasks[0]));
 			} else {
-				let recentlyUsedTasks = this.getRecentlyUsedTasks();
+				let recentlyUsedTasks = await this.readRecentTasks();
 				let recent: Task[] = [];
+				let recentSet: Set<string> = new Set();
 				let configured: Task[] = [];
 				let detected: Task[] = [];
 				let taskMap: IStringDictionary<Task> = Object.create(null);
 				tasks.forEach(task => {
-					let key = task.getRecentlyUsedKey();
+					let key = task.getCommonTaskId();
 					if (key) {
 						taskMap[key] = task;
 					}
 				});
-				recentlyUsedTasks.keys().reverse().forEach(key => {
-					let task = taskMap[key];
-					if (task) {
-						recent.push(task);
+				recentlyUsedTasks.reverse().forEach(recentTask => {
+					const key = recentTask.getCommonTaskId();
+					if (key) {
+						recentSet.add(key);
+						let task = taskMap[key];
+						if (task) {
+							recent.push(task);
+						}
 					}
 				});
 				for (let task of tasks) {
-					let key = task.getRecentlyUsedKey();
-					if (!key || !recentlyUsedTasks.has(key)) {
+					let key = task.getCommonTaskId();
+					if (!key || !recentSet.has(key)) {
 						if ((task._source.kind === TaskSourceKind.Workspace) || (task._source.kind === TaskSourceKind.User)) {
 							configured.push(task);
 						} else {
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -588,6 +588,18 @@ export abstract class CommonTask {
 		return undefined;
 	}
 
+	protected abstract getFolderId(): string | undefined;
+
+	public getCommonTaskId(): string {
+		interface RecentTaskKey {
+			folder: string | undefined;
+			id: string;
+		}
+
+		const key: RecentTaskKey = { folder: this.getFolderId(), id: this._id };
+		return JSON.stringify(key);
+	}
+
 	public clone(): Task {
 		return this.fromObject(Objects.assign({}, <any>this));
 	}
@@ -728,13 +740,21 @@ export class CustomTask extends CommonTask {
 		return workspaceFolder ? `${workspaceFolder.uri.toString()}|${this._id}|${this.instance}` : `${this._id}|${this.instance}`;
 	}
 
+	protected getFolderId(): string | undefined {
+		return this._source.kind === TaskSourceKind.User ? USER_TASKS_GROUP_KEY : this._source.config.workspaceFolder?.uri.toString();
+	}
+
+	public getCommonTaskId(): string {
+		return this._source.customizes ? super.getCommonTaskId() : (this.getRecentlyUsedKey() ?? super.getCommonTaskId());
+	}
+
 	public getRecentlyUsedKey(): string | undefined {
 		interface CustomKey {
 			type: string;
 			folder: string;
 			id: string;
 		}
-		let workspaceFolder = this._source.kind === TaskSourceKind.User ? USER_TASKS_GROUP_KEY : this._source.config.workspaceFolder?.uri.toString();
+		let workspaceFolder = this.getFolderId();
 		if (!workspaceFolder) {
 			return undefined;
 		}
@@ -803,13 +823,17 @@ export class ConfiguringTask extends CommonTask {
 		return this._source.config.workspaceFolder;
 	}
 
+	protected getFolderId(): string | undefined {
+		return this._source.kind === TaskSourceKind.User ? USER_TASKS_GROUP_KEY : this._source.config.workspaceFolder?.uri.toString();
+	}
+
 	public getRecentlyUsedKey(): string | undefined {
 		interface CustomKey {
 			type: string;
 			folder: string;
 			id: string;
 		}
-		let workspaceFolder = this._source.kind === TaskSourceKind.User ? USER_TASKS_GROUP_KEY : this._source.config.workspaceFolder?.uri.toString();
+		let workspaceFolder = this.getFolderId();
 		if (!workspaceFolder) {
 			return undefined;
 		}
@@ -865,6 +889,13 @@ export class ContributedTask extends CommonTask {
 			: `${this._source.scope.toString()}|${this._id}|${this.instance}`;
 	}
 
+	protected getFolderId(): string | undefined {
+		if (this._source.scope === TaskScope.Folder && this._source.workspaceFolder) {
+			return this._source.workspaceFolder.uri.toString();
+		}
+		return undefined;
+	}
+
 	public getRecentlyUsedKey(): string | undefined {
 		interface ContributedKey {
 			type: string;
@@ -874,9 +905,7 @@ export class ContributedTask extends CommonTask {
 		}
 
 		let key: ContributedKey = { type: 'contributed', scope: this._source.scope, id: this._id };
-		if (this._source.scope === TaskScope.Folder && this._source.workspaceFolder) {
-			key.folder = this._source.workspaceFolder.uri.toString();
-		}
+		key.folder = this.getFolderId();
 		return JSON.stringify(key);
 	}
 
@@ -921,6 +950,10 @@ export class InMemoryTask extends CommonTask {
 		return `${this._id}|${this.instance}`;
 	}
 
+	protected getFolderId(): undefined {
+		return undefined;
+	}
+
 	protected fromObject(object: InMemoryTask): InMemoryTask {
 		return new InMemoryTask(object._id, object._source, object._label, object.type, object.runOptions, object.configurationProperties);
 	}
