Fix memory leak in comments browser (microsoft#205162)

* Fix memory leak in comments browser

* 💄

---------

Co-authored-by: Alex Ross <[email protected]>

Author: werat

src/vs/workbench/contrib/comments/browser/commentNode.ts

@@ -8,7 +8,7 @@ import * as dom from 'vs/base/browser/dom';
 import * as languages from 'vs/editor/common/languages';
 import { ActionsOrientation, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action, IActionRunner, IAction, Separator, ActionRunner } from 'vs/base/common/actions';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
@@ -576,12 +576,10 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 
 		this._commentEditorModel?.dispose();
 
-		this._commentEditorDisposables.forEach(dispose => dispose.dispose());
+		dispose(this._commentEditorDisposables);
 		this._commentEditorDisposables = [];
-		if (this._commentEditor) {
-			this._commentEditor.dispose();
-			this._commentEditor = null;
-		}
+		this._commentEditor?.dispose();
+		this._commentEditor = null;
 
 		this._commentEditContainer!.remove();
 	}
@@ -766,6 +764,11 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			}, 3000);
 		}
 	}
+
+	override dispose(): void {
+		super.dispose();
+		dispose(this._commentEditorDisposables);
+	}
 }
 
 function fillInActions(groups: [string, Array<MenuItemAction | SubmenuItemAction>][], target: IAction[] | { primary: IAction[]; secondary: IAction[] }, useAlternativeActions: boolean, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {

src/vs/workbench/contrib/comments/browser/commentReply.ts

@@ -6,7 +6,7 @@
 import * as dom from 'vs/base/browser/dom';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
 import { IAction } from 'vs/base/common/actions';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { MarshalledId } from 'vs/base/common/marshallingIds';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
@@ -369,4 +369,8 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 		});
 	}
 
+	override dispose(): void {
+		super.dispose();
+		dispose(this._commentThreadDisposables);
+	}
 }

src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts

@@ -261,6 +261,7 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 
 	override dispose() {
 		super.dispose();
+		dispose(this._commentThreadDisposables);
 		this.updateCurrentThread(false, false);
 	}