Skip to content

Fix: Mounting and unmounting file diffs in quick succession causes shiki highlighting to stop working #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amadeus merged 4 commits into from
Feb 14, 2026
Merged

Fix: Mounting and unmounting file diffs in quick succession causes shiki highlighting to stop working #337

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17d7a5a
fix: handle worker task cleanup to prevent busy state
Feb 14, 2026
be28d59
fix: change parameter order in clearWorkerTask to prevent task cleanu…
Feb 14, 2026
1059108
fix: rename clearWorkerTask to cleanWorkerAndTask for clarity
Feb 14, 2026
8b43b8a
fix: update task check to handle null and undefined cases
Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions packages/diffs/src/worker/WorkerPoolManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ export class WorkerPoolManager {
}
this.executeTask(availableWorker, task);
} catch {
this.clearWorkerTask(task, availableWorker);
this.cleanWorkerAndTask(availableWorker, task);
}
}

Expand Down Expand Up @@ -721,9 +721,7 @@ export class WorkerPoolManager {
}
}

if (task != null) {
this.clearWorkerTask(task, managedWorker);
}
this.cleanWorkerAndTask(managedWorker, task);
this.queueBroadcastStateChanges();
if (this.taskQueue.size > 0) {
// We queue drain so that potentially multiple workers can free up
Expand Down Expand Up @@ -751,12 +749,17 @@ export class WorkerPoolManager {
this.pendingTasks.set(task.id, task);
}

private clearWorkerTask(task: AllWorkerTasks, managedWorker: ManagedWorker) {
private cleanWorkerAndTask(
managedWorker: ManagedWorker,
task?: AllWorkerTasks
) {
managedWorker.request_id = undefined;
if ('instance' in task) {
this.instanceRequestMap.delete(task.instance);
if (task != null) {
if ('instance' in task) {
this.instanceRequestMap.delete(task.instance);
}
this.pendingTasks.delete(task.id);
}
this.pendingTasks.delete(task.id);
}

private executeTask(
Expand All @@ -770,7 +773,7 @@ export class WorkerPoolManager {
try {
managedWorker.worker.postMessage(task.request);
} catch (error) {
this.clearWorkerTask(task, managedWorker);
this.cleanWorkerAndTask(managedWorker, task);
console.error('Failed to post message to worker:', error);
if ('instance' in task) {
task.instance.onHighlightError(error);
Expand Down