Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-29 09:09:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #194618

Browse Source
This commit is contained in:
Jean Pierre
2023-12-14 12:54:39 -05:00
parent b70a276229
commit 1ff0d63010
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/common/extHostTask.ts
+20 -22
View File
@@ -501,6 +501,11 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
}
public async $OnDidEndTask(execution: tasks.ITaskExecutionDTO): Promise<void> {
if (!this._taskExecutionPromises.has(execution.id)) {
// Event already fired by the main thread
// See https://github.com/microsoft/vscode/commit/aaf73920aeae171096d205efb2c58804a32b6846
return;
}
const _execution = await this.getTaskExecution(execution);
this._taskExecutionPromises.delete(execution.id);
this._taskExecutions.delete(execution.id);
@@ -633,29 +638,22 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
if (result) {
return result;
}
const createdResult: Promise<TaskExecutionImpl> = new Promise((resolve, reject) => {
function resolvePromiseWithCreatedTask(that: ExtHostTaskBase, execution: tasks.ITaskExecutionDTO, taskToCreate: vscode.Task | types.Task | undefined) {
if (!taskToCreate) {
reject('Unexpected: Task does not exist.');
} else {
resolve(new TaskExecutionImpl(that, execution.id, taskToCreate));
let executionPromise: Promise<TaskExecutionImpl>;
if (!task) {
executionPromise = TaskDTO.to(execution.task, this._workspaceProvider, this._providedCustomExecutions2).then(t => {
if (!t) {
throw new ErrorNoTelemetry('Unexpected: Task does not exist.');
}
}
if (task) {
resolvePromiseWithCreatedTask(this, execution, task);
} else {
TaskDTO.to(execution.task, this._workspaceProvider, this._providedCustomExecutions2)
.then(task => resolvePromiseWithCreatedTask(this, execution, task));
}
});
this._taskExecutionPromises.set(execution.id, createdResult);
return createdResult.then(executionCreatedResult => {
this._taskExecutions.set(execution.id, executionCreatedResult);
return executionCreatedResult;
}, rejected => {
return Promise.reject(rejected);
return new TaskExecutionImpl(this, execution.id, t);
});
} else {
executionPromise = Promise.resolve(new TaskExecutionImpl(this, execution.id, task));
}
this._taskExecutionPromises.set(execution.id, executionPromise);
return executionPromise.then(taskExecution => {
this._taskExecutions.set(execution.id, taskExecution);
return taskExecution;
});
}