Skip to content

fix: memory leak in tunnel view #287142

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
alexr00 merged 9 commits into from
Feb 13, 2026
+26 −28
Merged

fix: memory leak in tunnel view #287142

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1050171
fix: memory leak in tunnel view
SimonSiefke Dec 11, 2025
a1ffc0e
fix: memory leak in tunnel view
SimonSiefke Dec 11, 2025
ff5512e
fix: memory leak in tunnel view
SimonSiefke Dec 11, 2025
b5777fe
Merge remote-tracking branch 'origin/main' into fix/memory-leak-tunne…
SimonSiefke Dec 14, 2025
4947512
Merge remote-tracking branch 'origin/main' into fix/memory-leak-tunne…
SimonSiefke Jan 6, 2026
c3c6e23
Merge branch 'main' into fix/memory-leak-tunnel-view
SimonSiefke Jan 12, 2026
b29baf3
Merge branch 'main' into fix/memory-leak-tunnel-view
SimonSiefke Jan 12, 2026
f804bd9
Merge branch 'main' into fix/memory-leak-tunnel-view
alexr00 Feb 13, 2026
adc18d0
Some clean up
alexr00 Feb 13, 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
54 changes: 26 additions & 28 deletions src/vs/workbench/contrib/remote/browser/tunnelView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../
import { ICommandService, ICommandHandler, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
import { Event } from '../../../../base/common/event.js';
import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
import { toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
import { ActionRunner, IAction } from '../../../../base/common/actions.js';
Expand Down Expand Up @@ -320,7 +320,8 @@ class PrivacyColumn implements ITableColumn<ITunnelItem, ActionBarCell> {
}

interface IActionBarTemplateData {
elementDisposable: IDisposable;
readonly elementDisposables: DisposableStore;
readonly templateDisposables: DisposableStore;
container: HTMLElement;
label: IconLabel;
button?: Button;
Expand All @@ -338,7 +339,7 @@ interface ActionBarCell {
editId: TunnelEditId;
}

class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCell, IActionBarTemplateData> {
class ActionBarRenderer implements ITableRenderer<ActionBarCell, IActionBarTemplateData> {
readonly templateId = 'actionbar';
private inputDone?: (success: boolean, finishEditing: boolean) => void;
private _actionRunner: ActionRunner | undefined;
Expand All @@ -353,8 +354,6 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
@ICommandService private readonly commandService: ICommandService,
@IConfigurationService private readonly configurationService: IConfigurationService,
) {
super();

this._hoverDelegate = getDefaultHoverDelegate('mouse');
}

Expand All @@ -365,17 +364,20 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
renderTemplate(container: HTMLElement): IActionBarTemplateData {
const cell = dom.append(container, dom.$('.ports-view-actionbar-cell'));
const icon = dom.append(cell, dom.$('.ports-view-actionbar-cell-icon'));
const label = new IconLabel(cell,
const templateDisposables = new DisposableStore();
const elementDisposables = new DisposableStore();
templateDisposables.add(elementDisposables);
const label = templateDisposables.add(new IconLabel(cell,
{
supportHighlights: true,
hoverDelegate: this._hoverDelegate
});
}));
const actionsContainer = dom.append(cell, dom.$('.actions'));
const actionBar = new ActionBar(actionsContainer, {
const actionBar = templateDisposables.add(new ActionBar(actionsContainer, {
actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
hoverDelegate: this._hoverDelegate
});
return { label, icon, actionBar, container: cell, elementDisposable: Disposable.None };
}));
return { label, icon, actionBar, container: cell, templateDisposables, elementDisposables };
}

renderElement(element: ActionBarCell, index: number, templateData: IActionBarTemplateData): void {
Expand All @@ -388,18 +390,19 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
templateData.container.style.height = '22px';
if (templateData.button) {
templateData.button.element.style.display = 'none';
templateData.button.dispose();
}
templateData.container.style.paddingLeft = '0px';
templateData.elementDisposable.dispose();

templateData.elementDisposables.clear();


let editableData: IEditableData | undefined;
if (element.editId === TunnelEditId.New && (editableData = this.remoteExplorerService.getEditableData(undefined))) {
this.renderInputBox(templateData.container, editableData);
this.renderInputBox(templateData, editableData);
} else {
editableData = this.remoteExplorerService.getEditableData(element.tunnel, element.editId);
if (editableData) {
this.renderInputBox(templateData.container, editableData);
this.renderInputBox(templateData, editableData);
} else if ((element.tunnel.tunnelType === TunnelType.Add) && (element.menuId === MenuId.TunnelPortInline)) {
this.renderButton(element, templateData);
} else {
Expand All @@ -411,10 +414,10 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
renderButton(element: ActionBarCell, templateData: IActionBarTemplateData): void {
templateData.container.style.paddingLeft = '7px';
templateData.container.style.height = '28px';
templateData.button = this._register(new Button(templateData.container, defaultButtonStyles));
templateData.button = templateData.elementDisposables.add(new Button(templateData.container, defaultButtonStyles));
templateData.button.label = element.label;
templateData.button.element.title = element.tooltip;
this._register(templateData.button.onDidClick(() => {
templateData.elementDisposables.add(templateData.button.onDidClick(() => {
this.commandService.executeCommand(ForwardPortAction.INLINE_ID);
}));
}
Expand Down Expand Up @@ -464,10 +467,8 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
[TunnelProtocolContextKey.key, element.tunnel.protocol]
];
const contextKeyService = this.contextKeyService.createOverlay(context);
const disposableStore = new DisposableStore();
templateData.elementDisposable = disposableStore;
if (element.menuId) {
const menu = disposableStore.add(this.menuService.createMenu(element.menuId, contextKeyService));
const menu = templateData.elementDisposables.add(this.menuService.createMenu(element.menuId, contextKeyService));
let actions = getFlatActionBarActions(menu.getActions({ shouldForwardArgs: true }));
if (actions) {
const labelActions = actions.filter(action => action.id.toLowerCase().indexOf('label') >= 0);
Expand All @@ -489,12 +490,13 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
}
}

private renderInputBox(container: HTMLElement, editableData: IEditableData): IDisposable {
private renderInputBox(templateData: IActionBarTemplateData, editableData: IEditableData): void {
// Required for FireFox. The blur event doesn't fire on FireFox when you just mash the "+" button to forward a port.
if (this.inputDone) {
this.inputDone(false, false);
this.inputDone = undefined;
}
const { container } = templateData;
container.style.paddingLeft = '5px';
const value = editableData.startingValue || '';
const inputBox = new InputBox(container, this.contextViewService, {
Expand Down Expand Up @@ -554,20 +556,17 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
})
];

return toDisposable(() => {
templateData.elementDisposables.add(toDisposable(() => {
done(false, false);
});
}));
}

disposeElement(element: ActionBarCell, index: number, templateData: IActionBarTemplateData) {
templateData.elementDisposable.dispose();
templateData.elementDisposables.clear();
}

disposeTemplate(templateData: IActionBarTemplateData): void {
templateData.label.dispose();
templateData.actionBar.dispose();
templateData.elementDisposable.dispose();
templateData.button?.dispose();
templateData.templateDisposables.dispose();
}
}

Expand Down Expand Up @@ -1817,4 +1816,3 @@ MenuRegistry.appendMenuItem(MenuId.TunnelLocalAddressInline, ({
}));

registerColor('ports.iconRunningProcessForeground', STATUS_BAR_REMOTE_ITEM_BACKGROUND, nls.localize('portWithRunningProcess.foreground', "The color of the icon for a port that has an associated running process."));

Loading