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

Extension development：Frequent calls to _onDidChangeTreeData.fire(), resulting in memory leakage #193799

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Extension development：Frequent calls to _onDidChangeTreeData.fire(), resulting in memory leakage #193799

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
26 changes: 9 additions & 17 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 @@ -1259,10 +1259,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS

templateData.actionBar.context = <TreeViewItemHandleArg>{ $treeViewId: this.treeViewId, $treeItemHandle: node.handle };

const menuActions = this.menus.getResourceActions(node);
if (menuActions.menu) {
templateData.elementDisposable.add(menuActions.menu);
}
const menuActions = this.menus.getResourceActions(node, templateData.elementDisposable);
templateData.actionBar.push(menuActions.actions, { icon: true, label: false });

if (this._actionRunner) {
Expand Down Expand Up @@ -1513,23 +1510,18 @@ class MultipleSelectionActionRunner extends ActionRunner {
}
}

class TreeMenus extends Disposable implements IDisposable {
class TreeMenus implements IDisposable {
private contextKeyService: IContextKeyService | undefined;
private _onDidChange = new Emitter<ITreeItem>();
public readonly onDidChange = this._onDidChange.event;

constructor(
private id: string,
@IMenuService private readonly menuService: IMenuService
) {
super();
}
) { }

/**
* Caller is now responsible for disposing of the menu!
*/
getResourceActions(element: ITreeItem): { menu?: IMenu; actions: IAction[] } {
const actions = this.getActions(MenuId.ViewItemContext, element, true);
getResourceActions(element: ITreeItem, disposableStore: DisposableStore): { menu?: IMenu; actions: IAction[] } {
const actions = this.getActions(MenuId.ViewItemContext, element, disposableStore);
return { menu: actions.menu, actions: actions.primary };
}

Expand All @@ -1541,7 +1533,7 @@ class TreeMenus extends Disposable implements IDisposable {
this.contextKeyService = service;
}

private getActions(menuId: MenuId, element: ITreeItem, listen: boolean = false): { menu?: IMenu; primary: IAction[]; secondary: IAction[] } {
private getActions(menuId: MenuId, element: ITreeItem, listen?: DisposableStore): { menu?: IMenu; primary: IAction[]; secondary: IAction[] } {
if (!this.contextKeyService) {
return { primary: [], secondary: [] };
}
Expand All @@ -1557,16 +1549,16 @@ class TreeMenus extends Disposable implements IDisposable {
const result = { primary, secondary, menu };
createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
if (listen) {
this._register(menu.onDidChange(() => this._onDidChange.fire(element)));
listen.add(menu.onDidChange(() => this._onDidChange.fire(element)));
listen.add(menu);
} else {
menu.dispose();
}
return result;
}

override dispose() {
dispose() {
this.contextKeyService = undefined;
super.dispose();
}
}

Expand Down