Register a few more disposable stores in notebooks

Some of these don't seem to be getting cleaned up correctly today
This commit is contained in:
Matt Bierner 2021-08-18 20:17:55 -07:00
parent f84c1c1821
commit bfc4707538
No known key found for this signature in database
GPG key ID: 099C331567E11888
7 changed files with 12 additions and 19 deletions

View file

@ -24,7 +24,7 @@ export class FindModel extends Disposable {
private _currentMatch: number = -1;
private _allMatchesDecorations: ICellModelDecorations[] = [];
private _currentMatchDecorations: ICellModelDecorations[] = [];
private _modelDisposable = new DisposableStore();
private readonly _modelDisposable = this._register(new DisposableStore());
get findMatches() {
return this._findMatches;

View file

@ -302,10 +302,8 @@ abstract class AbstractElementRenderer extends Disposable {
super();
// init
this._isDisposed = false;
this._metadataEditorDisposeStore = new DisposableStore();
this._outputEditorDisposeStore = new DisposableStore();
this._register(this._metadataEditorDisposeStore);
this._register(this._outputEditorDisposeStore);
this._metadataEditorDisposeStore = this._register(new DisposableStore());
this._outputEditorDisposeStore = this._register(new DisposableStore());
this._register(cell.onDidLayoutChange(e => this.layout(e)));
this._register(cell.onDidLayoutChange(e => this.updateBorders()));
this.init();

View file

@ -26,7 +26,7 @@ interface IMimeTypeRenderer extends IQuickPickItem {
}
export class OutputElement extends Disposable {
readonly resizeListener = new DisposableStore();
readonly resizeListener = this._register(new DisposableStore());
domNode!: HTMLElement;
renderResult?: IRenderOutput;

View file

@ -49,7 +49,7 @@ export class NotebookProviderInfoStore extends Disposable {
private _handled: boolean = false;
private readonly _contributedEditors = new Map<string, NotebookProviderInfo>();
private readonly _contributedEditorDisposables = new DisposableStore();
private readonly _contributedEditorDisposables = this._register(new DisposableStore());
constructor(
@IStorageService storageService: IStorageService,

View file

@ -1080,7 +1080,7 @@ export class ListTopCellToolbar extends Disposable {
private topCellToolbar: HTMLElement;
private menu: IMenu;
private toolbar: ToolBar;
private _modelDisposables = new DisposableStore();
private readonly _modelDisposables = this._register(new DisposableStore());
constructor(
protected readonly notebookEditor: INotebookEditor,

View file

@ -134,7 +134,7 @@ export class NotebookCellTextModel extends Disposable implements ICell {
return this._alternativeId;
}
private _textModelDisposables = new DisposableStore();
private readonly _textModelDisposables = this._register(new DisposableStore());
private _textModel: TextModel | undefined = undefined;
get textModel(): TextModel | undefined {
return this._textModel;

View file

@ -443,10 +443,10 @@ export class ComplexNotebookEditorModel extends EditorModel implements INotebook
export class SimpleNotebookEditorModel extends EditorModel implements INotebookEditorModel {
private readonly _onDidChangeDirty = new Emitter<void>();
private readonly _onDidSave = new Emitter<void>();
private readonly _onDidChangeOrphaned = new Emitter<void>();
private readonly _onDidChangeReadonly = new Emitter<void>();
private readonly _onDidChangeDirty = this._register(new Emitter<void>());
private readonly _onDidSave = this._register(new Emitter<void>());
private readonly _onDidChangeOrphaned = this._register(new Emitter<void>());
private readonly _onDidChangeReadonly = this._register(new Emitter<void>());
readonly onDidChangeDirty: Event<void> = this._onDidChangeDirty.event;
readonly onDidSave: Event<void> = this._onDidSave.event;
@ -454,7 +454,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
readonly onDidChangeReadonly: Event<void> = this._onDidChangeReadonly.event;
private _workingCopy?: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>;
private readonly _workingCopyListeners = new DisposableStore();
private readonly _workingCopyListeners = this._register(new DisposableStore());
constructor(
readonly resource: URI,
@ -468,12 +468,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
}
override dispose(): void {
this._workingCopyListeners.dispose();
this._workingCopy?.dispose();
this._onDidChangeDirty.dispose();
this._onDidSave.dispose();
this._onDidChangeOrphaned.dispose();
this._onDidChangeReadonly.dispose();
super.dispose();
}