Skip to content
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

Jump to bottom

Fix memory leak in tree #202080

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Fix memory leak in tree #202080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/vs/workbench/api/browser/mainThreadTreeViews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
}

getChildren(treeItem?: ITreeItem): Promise<ITreeItem[] | undefined> {
if (!treeItem) {
this.itemsMap.clear();
}
return this._proxy.$getChildren(this.treeViewId, treeItem ? treeItem.handle : undefined)
.then(
children => this.postGetChildren(children),
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/api/browser/viewsExtensionPoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
if (!treeItem.tooltip) {
return;
}
const element = treeViewsService.getRenderedTreeElement(treeItem);
const element = treeViewsService.getRenderedTreeElement(('handle' in treeItem) ? treeItem.handle : treeItem);
if (!element) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/browser/parts/views/treeView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
templateData.actionBar.actionRunner = this._actionRunner;
}
this.setAlignment(templateData.container, node);
this.treeViewsService.addRenderedTreeItemElement(node, templateData.container);
this.treeViewsService.addRenderedTreeItemElement(node.handle, templateData.container);

// remember rendered element, an element can be rendered multiple times
const renderedItems = this._renderedElements.get(element.element.handle) ?? [];
Expand Down Expand Up @@ -1427,7 +1427,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
itemRenders.splice(renderedIndex, 1);
}

this.treeViewsService.removeRenderedTreeItemElement(resource.element);
this.treeViewsService.removeRenderedTreeItemElement(resource.element.handle);

templateData.checkbox?.dispose();
templateData.checkbox = undefined;
Expand Down
3 changes: 1 addition & 2 deletions src/vs/workbench/services/views/browser/treeViewsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@

import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { ITreeItem } from 'vs/workbench/common/views';
import { ITreeViewsService as ITreeViewsServiceCommon, TreeviewsService } from 'vs/workbench/services/views/common/treeViewsService';

export interface ITreeViewsService extends ITreeViewsServiceCommon<ITreeItem, HTMLElement> { }
export interface ITreeViewsService extends ITreeViewsServiceCommon<HTMLElement> { }
export const ITreeViewsService = createDecorator<ITreeViewsService>('treeViewsService');
registerSingleton(ITreeViewsService, TreeviewsService, InstantiationType.Delayed);
18 changes: 9 additions & 9 deletions src/vs/workbench/services/views/common/treeViewsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

export interface ITreeViewsService<U, V> {
export interface ITreeViewsService<V> {
readonly _serviceBrand: undefined;

getRenderedTreeElement(node: U): V | undefined;
addRenderedTreeItemElement(node: U, element: V): void;
removeRenderedTreeItemElement(node: U): void;
getRenderedTreeElement(node: string): V | undefined;
addRenderedTreeItemElement(node: string, element: V): void;
removeRenderedTreeItemElement(node: string): void;
}

export class TreeviewsService<U, V> implements ITreeViewsService<U, V> {
export class TreeviewsService<V> implements ITreeViewsService<V> {
_serviceBrand: undefined;
private _renderedElements: Map<U, V> = new Map();
private _renderedElements: Map<string, V> = new Map();

getRenderedTreeElement(node: U): V | undefined {
getRenderedTreeElement(node: string): V | undefined {
if (this._renderedElements.has(node)) {
return this._renderedElements.get(node);
}
return undefined;
}

addRenderedTreeItemElement(node: U, element: V): void {
addRenderedTreeItemElement(node: string, element: V): void {
this._renderedElements.set(node, element);
}

removeRenderedTreeItemElement(node: U): void {
removeRenderedTreeItemElement(node: string): void {
if (this._renderedElements.has(node)) {
this._renderedElements.delete(node);
}
Expand Down