Skip to content

Commit ca1f005

Browse files
committed
fix(task): simplify disposal promise memoization
1 parent a54e4db commit ca1f005

1 file changed

Lines changed: 4 additions & 15 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,23 +2530,11 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
25302530
return this.disposalPromise
25312531
}
25322532

2533-
let resolveDisposal!: () => void
2534-
let rejectDisposal!: (error: unknown) => void
2535-
this.disposalPromise = new Promise<void>((resolve, reject) => {
2536-
resolveDisposal = resolve
2537-
rejectDisposal = reject
2538-
})
2539-
2540-
try {
2541-
void this.disposeOnce().then(resolveDisposal, rejectDisposal)
2542-
} catch (error) {
2543-
rejectDisposal(error)
2544-
}
2545-
2533+
this.disposalPromise = this.disposeOnce()
25462534
return this.disposalPromise
25472535
}
25482536

2549-
private disposeOnce(): Promise<void> {
2537+
private async disposeOnce(): Promise<void> {
25502538
console.log(`[Task#dispose] disposing task ${this.taskId}.${this.instanceId}`)
25512539

25522540
// Stop the idle telemetry check and report any unflushed activity as a
@@ -2629,7 +2617,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
26292617
console.error("Error reverting diff changes:", error)
26302618
}
26312619

2632-
return pendingCleanup.then(() => this.diffReversionPromise)
2620+
await pendingCleanup
2621+
await this.diffReversionPromise
26332622
}
26342623

26352624
// Subtasks

0 commit comments

Comments
 (0)