Skip to content

Fix listener leak in chat code block editor pool disposal ordering #303548

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

Closed
Copilot wants to merge 2 commits into from
Closed

Fix listener leak in chat code block editor pool disposal ordering #303548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6395e14
Initial plan
Copilot Mar 20, 2026
0ec76a3
Fix listener leak: fire viewmodel update event before clearing pools
Copilot Mar 20, 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
16 changes: 10 additions & 6 deletions src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ export class EditorPool extends Disposable {
object: codeBlock,
isStale: () => stale,
dispose: () => {
codeBlock.reset();
stale = true;
this._pool.release(codeBlock);
if (!stale) {
codeBlock.reset();
stale = true;
this._pool.release(codeBlock);
}
}
};
}
Expand Down Expand Up @@ -79,9 +81,11 @@ export class DiffEditorPool extends Disposable {
object: codeBlock,
isStale: () => stale,
dispose: () => {
codeBlock.reset();
stale = true;
this._pool.release(codeBlock);
if (!stale) {
codeBlock.reset();
stale = true;
this._pool.release(codeBlock);
}
}
};
}
Expand Down
6 changes: 5 additions & 1 deletion src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,16 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
this.fileTreesByResponseId.clear();
this.focusedFileTreesByResponseId.clear();
this.responseTemplateDataByRequestId.clear();

// Fire first so that templates clear their rendered parts and release pool
// items back into the pool arrays, then clear the pools to dispose them.
// Clearing the pools before firing would leave released items undisposed.
this._onDidUpdateViewModel.fire();
this._editorPool.clear();
this._toolEditorPool.clear();
this._diffEditorPool.clear();
this._treePool.clear();
this._contentReferencesListPool.clear();
this._onDidUpdateViewModel.fire();
}

getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
Expand Down
Loading