Skip to content

Always mark notebook list rendering elementDisposables as disposed #163382

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
mjbvz merged 1 commit into from
Oct 12, 2022
Merged

Always mark notebook list rendering elementDisposables as disposed #163382

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTe
readonly metadataInfoContainer: HTMLElement;
readonly outputHeaderContainer: HTMLElement;
readonly outputInfoContainer: HTMLElement;

}


Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
disposeTemplate(templateData: CellDiffSingleSideRenderTemplate): void {
templateData.container.innerText = '';
templateData.sourceEditor.dispose();
templateData.elementDisposables.dispose();
}

disposeElement(element: SingleSideDiffElementViewModel, index: number, templateData: CellDiffSingleSideRenderTemplate): void {
Expand Down Expand Up @@ -275,6 +276,7 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
templateData.container.innerText = '';
templateData.sourceEditor.dispose();
templateData.toolbar?.dispose();
templateData.elementDisposables.dispose();
}

disposeElement(element: SideBySideDiffElementViewModel, index: number, templateData: CellDiffSideBySideRenderTemplate): void {
Expand Down
16 changes: 8 additions & 8 deletions src/vs/workbench/contrib/notebook/browser/view/notebookRenderingCommon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ export interface INotebookCellList {
}

export interface BaseCellRenderTemplate {
rootContainer: HTMLElement;
editorPart: HTMLElement;
cellInputCollapsedContainer: HTMLElement;
instantiationService: IInstantiationService;
container: HTMLElement;
cellContainer: HTMLElement;
readonly rootContainer: HTMLElement;
readonly editorPart: HTMLElement;
readonly cellInputCollapsedContainer: HTMLElement;
readonly instantiationService: IInstantiationService;
readonly container: HTMLElement;
readonly cellContainer: HTMLElement;
readonly templateDisposables: DisposableStore;
readonly elementDisposables: DisposableStore;
currentRenderedCell?: ICellViewModel;
Expand All @@ -106,8 +106,8 @@ export interface BaseCellRenderTemplate {
}

export interface MarkdownCellRenderTemplate extends BaseCellRenderTemplate {
editorContainer: HTMLElement;
foldingIndicator: HTMLElement;
readonly editorContainer: HTMLElement;
readonly foldingIndicator: HTMLElement;
currentEditor?: ICodeEditor;
}

Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
}

disposeTemplate(templateData: MarkdownCellRenderTemplate): void {
templateData.templateDisposables.clear();
templateData.elementDisposables.dispose();
Copy link
Copy Markdown
Member

@roblourens roblourens Oct 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually just add these to templateDisposables (this one is probably on me)

templateData.templateDisposables.dispose();
}

disposeElement(_element: ICellViewModel, _index: number, templateData: MarkdownCellRenderTemplate): void {
Expand Down