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 plugin tree views #12353

Merged
merged 2 commits into from
Apr 12, 2023
Merged

Fix memory leak in plugin tree views #12353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
964f64a
Fix memory leak in plugin tree views
pisv Mar 27, 2023
4347ab6
Merge branch 'master' into GH-10404
tsmaeder Apr 12, 2023
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
7 changes: 4 additions & 3 deletions packages/plugin-ext/src/plugin/tree/tree-views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ class TreeViewExtImpl<T> implements Disposable {
}

async getChildren(parentId: string): Promise<TreeViewItem[] | undefined> {
const parentNode = this.nodes.get(parentId);
let parentNode = this.nodes.get(parentId);
const parent = parentNode?.value;
if (parentId && !parent) {
console.error(`No tree item with id '${parentId}' found.`);
Expand All @@ -398,9 +398,10 @@ class TreeViewExtImpl<T> implements Disposable {
this.clearChildren(parentNode);

// place root in the cache
if (parentId === '') {
if (parentId === '' && !parentNode) {
const rootNodeDisposables = new DisposableCollection();
this.nodes.set(parentId, { id: '', disposables: rootNodeDisposables, dispose: () => { rootNodeDisposables.dispose(); } });
parentNode = { id: '', disposables: rootNodeDisposables, dispose: () => { rootNodeDisposables.dispose(); } };
this.nodes.set(parentId, parentNode);
}
// ask data provider for children for cached element
const result = await this.options.treeDataProvider.getChildren(parent);
Expand Down