Skip to content

Commit ba408c1

Browse files
author
Bertan Ari
committed
fix: make task-listener cleanup a module helper so provider doubles keep working
1 parent 7710024 commit ba408c1

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎src/core/webview/ClineProvider.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,14 @@ type GetStateOptions = {
209209
includeTaskHistory?: boolean
210210
}
211211

212+
function removeTaskEventListeners(listeners: WeakMap<Task, Array<() => void>>, task: Task): void {
213+
const cleanupFunctions = listeners.get(task)
214+
if (cleanupFunctions) {
215+
cleanupFunctions.forEach((cleanup) => cleanup())
216+
listeners.delete(task)
217+
}
218+
}
219+
212220
export class ClineProvider
213221
extends EventEmitter<TaskProviderEvents>
214222
implements vscode.WebviewViewProvider, TelemetryPropertiesProvider, TaskProviderLike
@@ -634,14 +642,6 @@ export class ClineProvider
634642
}
635643
}
636644

637-
private removeTaskEventListeners(task: Task): void {
638-
const cleanupFunctions = this.taskEventListeners.get(task)
639-
if (cleanupFunctions) {
640-
cleanupFunctions.forEach((cleanup) => cleanup())
641-
this.taskEventListeners.delete(task)
642-
}
643-
}
644-
645645
private async cleanupFailedHistoryTask(task: Task, error: unknown): Promise<void> {
646646
if (!(error instanceof PendingActionSettlementError)) {
647647
return
@@ -654,7 +654,7 @@ export class ClineProvider
654654
this.taskRegistry.remove(task.taskId)
655655
task.emit(RooCodeEventName.TaskUnfocused)
656656

657-
this.removeTaskEventListeners(task)
657+
removeTaskEventListeners(this.taskEventListeners, task)
658658

659659
try {
660660
await task.dispose()
@@ -1459,7 +1459,7 @@ export class ClineProvider
14591459

14601460
// The current task may have changed or been removed during the awaits above; never touch it.
14611461
if (oldTask?.taskId !== task.taskId) {
1462-
this.removeTaskEventListeners(task)
1462+
removeTaskEventListeners(this.taskEventListeners, task)
14631463
await task.abortTask(true).catch(() => {})
14641464
return task
14651465
}
@@ -1474,7 +1474,7 @@ export class ClineProvider
14741474
)
14751475
}
14761476

1477-
this.removeTaskEventListeners(oldTask)
1477+
removeTaskEventListeners(this.taskEventListeners, oldTask)
14781478

14791479
// Replace in-place: preserves stack index and current pointer
14801480
this.taskRegistry.replace(oldTask.taskId, task)

‎src/core/webview/__tests__/checkpointRestoreHandler.spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ function createFixture() {
9393
setPendingEditOperation: vi.fn<ClineProvider["setPendingEditOperation"]>(),
9494
clearPendingEditOperation: vi.fn<ClineProvider["clearPendingEditOperation"]>(),
9595
getPendingEditOperation: ClineProvider.prototype["getPendingEditOperation"],
96-
removeTaskEventListeners: ClineProvider.prototype["removeTaskEventListeners"],
9796
getState: vi.fn(async () => ({ apiConfiguration: {} })),
9897
contextProxy: { globalStorageUri: { fsPath: "/test/storage" } },
9998
taskScheduler: { schedule: vi.fn<(task: Task, run: () => Promise<void>) => Promise<void>>(async () => {}) },

0 commit comments

Comments
 (0)