Use base class's existing _register method

mjbvz · mjbvz · commit b61980c3dffb · 2019-07-19T17:36:17.000-07:00
diff --git a/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts b/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts
@@ -10,7 +10,7 @@ import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { language } from 'vs/base/common/platform';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { match } from 'vs/base/common/glob';
 import { IRequestService, asJson } from 'vs/platform/request/common/request';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -60,7 +60,6 @@ export class ExperimentService extends Disposable implements IExperimentService
 	private _experiments: IExperiment[] = [];
 	private _loadExperimentsPromise: Promise<void>;
 	private _curatedMapping = Object.create(null);
-	private _disposables: IDisposable[] = [];
 
 	private readonly _onExperimentEnabled = this._register(new Emitter<IExperiment>());
 	onExperimentEnabled: Event<IExperiment> = this._onExperimentEnabled.event;
@@ -392,14 +391,10 @@ export class ExperimentService extends Disposable implements IExperimentService
 					}
 				}
 			});
-			this._disposables.push(onSaveHandler);
+			this._register(onSaveHandler);
 			return ExperimentState.Evaluating;
 		});
 	}
-
-	dispose() {
-		this._disposables = dispose(this._disposables);
-	}
 }
 
 
diff --git a/src/vs/workbench/contrib/output/browser/outputActions.ts b/src/vs/workbench/contrib/output/browser/outputActions.ts
@@ -11,7 +11,6 @@ import { SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -67,11 +66,9 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
 	public static readonly ID = 'workbench.output.action.toggleOutputScrollLock';
 	public static readonly LABEL = nls.localize({ key: 'toggleOutputScrollLock', comment: ['Turn on / off automatic output scrolling'] }, "Toggle Output Scroll Lock");
 
-	private toDispose: IDisposable[] = [];
-
 	constructor(id: string, label: string, @IOutputService private readonly outputService: IOutputService) {
 		super(id, label, 'output-action output-scroll-unlock');
-		this.toDispose.push(this.outputService.onActiveOutputChannel(channel => {
+		this._register(this.outputService.onActiveOutputChannel(channel => {
 			const activeChannel = this.outputService.getActiveChannel();
 			if (activeChannel) {
 				this.setClassAndLabel(activeChannel.scrollLock);
@@ -104,11 +101,6 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
 			this.label = nls.localize('outputScrollOff', "Turn Auto Scrolling Off");
 		}
 	}
-
-	public dispose() {
-		super.dispose();
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export class SwitchOutputAction extends Action {
@@ -188,15 +180,13 @@ export class OpenLogOutputFile extends Action {
 	public static readonly ID = 'workbench.output.action.openLogOutputFile';
 	public static readonly LABEL = nls.localize('openInLogViewer', "Open Log File");
 
-	private disposables: IDisposable[] = [];
-
 	constructor(
 		@IOutputService private readonly outputService: IOutputService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super(OpenLogOutputFile.ID, OpenLogOutputFile.LABEL, 'output-action open-log-file');
-		this.outputService.onActiveOutputChannel(this.update, this, this.disposables);
+		this._register(this.outputService.onActiveOutputChannel(this.update, this));
 		this.update();
 	}
 
