Fix #50555 - fix settings editor memory leak

src/vs/workbench/browser/parts/editor/editorGroupView.ts

@@ -1373,6 +1373,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		this._onWillDispose.fire();
 
 		this.titleAreaControl.dispose();
+		// this.editorControl = null;
 
 		super.dispose();
 	}

src/vs/workbench/parts/preferences/browser/settingsEditor2.ts

@@ -225,10 +225,10 @@ export class SettingsEditor2 extends BaseEditor {
 	private createHeaderControls(parent: HTMLElement): void {
 		const headerControlsContainerRight = DOM.append(parent, $('.settings-header-controls-right'));
 
-		this.toolbar = new ToolBar(headerControlsContainerRight, this.contextMenuService, {
+		this.toolbar = this._register(new ToolBar(headerControlsContainerRight, this.contextMenuService, {
 			ariaLabel: localize('settingsToolbarLabel', "Settings Editor Actions"),
 			actionRunner: this.actionRunner
-		});
+		}));
 
 		const actions: Action[] = [
 			this.instantiationService.createInstance(FilterByTagAction,
@@ -290,11 +290,11 @@ export class SettingsEditor2 extends BaseEditor {
 
 		const tocRenderer = this.instantiationService.createInstance(TOCRenderer);
 
-		this.tocTree = this.instantiationService.createInstance(TOCTree, this.tocTreeContainer,
+		this.tocTree = this._register(this.instantiationService.createInstance(TOCTree, this.tocTreeContainer,
 			this.viewState,
 			{
 				renderer: tocRenderer
-			});
+			}));
 
 		this._register(this.tocTree.onDidChangeFocus(e => {
 			// Let the caller finish before trying to sync with settings tree.
@@ -345,12 +345,12 @@ export class SettingsEditor2 extends BaseEditor {
 		}));
 		this._register(renderer.onDidClickSettingLink(settingName => this.revealSetting(settingName)));
 
-		this.settingsTree = this.instantiationService.createInstance(SettingsTree,
+		this.settingsTree = this._register(this.instantiationService.createInstance(SettingsTree,
 			this.settingsTreeContainer,
 			this.viewState,
 			{
 				renderer
-			});
+			}));
 
 		this._register(this.settingsTree.onDidChangeFocus(e => {
 			this.settingsTree.setSelection([e.focus], e.payload);

src/vs/workbench/parts/preferences/browser/settingsTree.ts

@@ -1462,9 +1462,10 @@ export class SettingsTree extends NonExpandableTree {
 	) {
 		const treeClass = 'settings-editor-tree';
 
+		const controller = instantiationService.createInstance(SettingsTreeController);
 		const fullConfiguration = <ITreeConfiguration>{
 			dataSource: instantiationService.createInstance(SettingsDataSource, viewState),
-			controller: instantiationService.createInstance(SettingsTreeController),
+			controller,
 			accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),
 			filter: instantiationService.createInstance(SettingsTreeFilter, viewState),
 			styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass),
@@ -1488,6 +1489,8 @@ export class SettingsTree extends NonExpandableTree {
 			instantiationService,
 			configurationService);
 
+		this.disposables.push(controller);
+
 		this.disposables.push(registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			const activeBorderColor = theme.getColor(focusBorder);
 			if (activeBorderColor) {