Skip to content

fix: memory leak in nativeBrowserElementsMainService #86

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

Draft
SimonSiefke wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: memory leak in nativeBrowserElementsMainService #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53f1dd4
fix: memory leak in nativeBrowserElementsMainService
SimonSiefke Jan 15, 2026
6ec57c4
Discard changes to src/vs/workbench/contrib/chat/browser/attachments/…
SimonSiefke Jan 15, 2026
66b6623
simpler fix
SimonSiefke Jan 15, 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
4 changes: 4 additions & 0 deletions src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
throw new Error('No target found');
}

if (token.isCancellationRequested) {
return;
}

window.win.webContents.on('ipc-message', async (event, channel, closedCancelAndDetachId) => {
if (channel === `vscode:cancelCurrentSession${cancelAndDetachId}`) {
if (cancelAndDetachId !== closedCancelAndDetachId) {
Expand Down
27 changes: 12 additions & 15 deletions src/vs/workbench/contrib/chat/browser/attachments/simpleBrowserEditorOverlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import './media/simpleBrowserOverlay.css';
import { combinedDisposable, DisposableMap, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
import { combinedDisposable, Disposable, DisposableMap, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
import { autorun, derivedOpts, observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observable.js';
import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
import { ThemeIcon } from '../../../../../base/common/themables.js';
Expand Down Expand Up @@ -313,11 +313,11 @@ class SimpleBrowserOverlayWidget {
}
}

class SimpleBrowserOverlayController {
class SimpleBrowserOverlayController extends Disposable {

private readonly _store = new DisposableStore();

private readonly _domNode = document.createElement('div');
private readonly _ctsDisposable = this._register(new MutableDisposable<CancellationTokenSource>());

constructor(
container: HTMLElement,
Expand All @@ -326,7 +326,7 @@ class SimpleBrowserOverlayController {
@IConfigurationService private readonly configurationService: IConfigurationService,
@IBrowserElementsService private readonly _browserElementsService: IBrowserElementsService,
) {

super();
if (!this.configurationService.getValue('chat.sendElementsToChat.enabled')) {
return;
}
Expand All @@ -339,14 +339,12 @@ class SimpleBrowserOverlayController {

const widget = instaService.createInstance(SimpleBrowserOverlayWidget, group, container);
this._domNode.appendChild(widget.getDomNode());
this._store.add(toDisposable(() => this._domNode.remove()));
this._store.add(widget);
this._register(toDisposable(() => this._domNode.remove()));
this._register(widget);

const connectingWebviewElement = document.createElement('div');
connectingWebviewElement.className = 'connecting-webview-element';


let cts = new CancellationTokenSource();
const show = async (locator: IBrowserTargetLocator) => {
widget.setActiveLocator(locator);

Expand All @@ -356,9 +354,10 @@ class SimpleBrowserOverlayController {
container.appendChild(connectingWebviewElement);
}

cts = new CancellationTokenSource();
this._ctsDisposable.value?.cancel();
this._ctsDisposable.value = new CancellationTokenSource();
try {
await this._browserElementsService.startDebugSession(cts.token, locator);
await this._browserElementsService.startDebugSession(this._ctsDisposable.value.token, locator);
} catch (error) {
connectingWebviewElement.textContent = localize('reopenErrorWebviewElement', 'Please reopen the preview.');
return;
Expand All @@ -372,8 +371,9 @@ class SimpleBrowserOverlayController {

const hide = () => {
widget.setActiveLocator(undefined);
this._ctsDisposable.value?.cancel();
this._ctsDisposable.clear();
if (container.contains(this._domNode)) {
cts.cancel();
this._domNode.remove();
}
connectingWebviewElement.remove();
Expand All @@ -397,7 +397,7 @@ class SimpleBrowserOverlayController {
return undefined;
});

this._store.add(autorun(r => {
this._register(autorun(r => {

const webviewId = activeIdObs.read(r);

Expand All @@ -410,9 +410,6 @@ class SimpleBrowserOverlayController {
}));
}

dispose(): void {
this._store.dispose();
}
}

export class SimpleBrowserOverlay implements IWorkbenchContribution {
Expand Down
Loading