From 317ee1598270765902e483412ca9c048686e2b4f Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 29 Jan 2020 16:15:52 +0100
Subject: [PATCH] Fix description of task in task quick open

Fixes https://github.com/microsoft/vscode/issues/89441
---
 .../contrib/tasks/browser/abstractTaskService.ts         | 2 +-
 src/vs/workbench/contrib/tasks/browser/quickOpen.ts      | 9 +--------
 src/vs/workbench/contrib/tasks/common/taskService.ts     | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 35d7f683a43..9fa3bd208a9 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -2480,7 +2480,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 	}
 
-	private getTaskDescription(task: Task): string | undefined {
+	public getTaskDescription(task: Task): string | undefined {
 		let description: string | undefined;
 		if (task._source.kind === TaskSourceKind.User) {
 			description = nls.localize('taskQuickPick.userSettings', 'User Settings');
diff --git a/src/vs/workbench/contrib/tasks/browser/quickOpen.ts b/src/vs/workbench/contrib/tasks/browser/quickOpen.ts
index 7863d7e66e5..a9d3f6b61a4 100644
--- a/src/vs/workbench/contrib/tasks/browser/quickOpen.ts
+++ b/src/vs/workbench/contrib/tasks/browser/quickOpen.ts
@@ -29,14 +29,7 @@ export class TaskEntry extends Model.QuickOpenEntry {
 	}
 
 	public getDescription(): string | undefined {
-		if (!this.taskService.needsFolderQualification()) {
-			return undefined;
-		}
-		let workspaceFolder = this.task.getWorkspaceFolder();
-		if (!workspaceFolder) {
-			return undefined;
-		}
-		return `${workspaceFolder.name}`;
+		return this.taskService.getTaskDescription(this.task);
 	}
 
 	public getAriaLabel(): string {
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
index 21ed4fa7174..fb2167017af 100644
--- a/src/vs/workbench/contrib/tasks/common/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -76,7 +76,7 @@ export interface ITaskService {
 	getRecentlyUsedTasks(): LinkedMap<string, string>;
 	createSorter(): TaskSorter;
 
-	needsFolderQualification(): boolean;
+	getTaskDescription(task: Task): string | undefined;
 	canCustomize(task: ContributedTask | CustomTask): boolean;
 	customize(task: ContributedTask | CustomTask, properties?: {}, openConfig?: boolean): Promise<void>;
 	openConfig(task: CustomTask | undefined): Promise<void>;
-- 
GitLab