From ffcc0223eba800466fc78c1258c809f260bc9741 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Thu, 8 Dec 2022 15:50:42 -0600 Subject: [PATCH 1/2] fix #168378 --- src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts index 0daa13e835f26..e2e3ae5cf045b 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -1226,6 +1226,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer this._handleError(error); return Promise.reject(error); } finally { + console.log('deleted', task._label); this._inProgressTasks.delete(task._label); } } @@ -1894,6 +1895,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer return; } const response = await this._taskSystem.terminate(task); + this._inProgressTasks.delete(task._label); if (response.success) { try { await this.run(task); From 56156dafe88b9fc708736d81054bc82dba5ae7fc Mon Sep 17 00:00:00 2001 From: meganrogge Date: Thu, 8 Dec 2022 15:55:13 -0600 Subject: [PATCH 2/2] clean up --- src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts index e2e3ae5cf045b..bbf45a180ec77 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -1226,7 +1226,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer this._handleError(error); return Promise.reject(error); } finally { - console.log('deleted', task._label); this._inProgressTasks.delete(task._label); } } @@ -1895,7 +1894,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer return; } const response = await this._taskSystem.terminate(task); - this._inProgressTasks.delete(task._label); if (response.success) { try { await this.run(task); @@ -1915,6 +1913,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer if (!this._taskSystem) { return { success: true, task: undefined }; } + this._inProgressTasks.delete(task._label); return this._taskSystem.terminate(task); }