Use toDisposable in a few more places

src/vs/base/browser/ui/contextview/contextview.ts

@@ -8,7 +8,7 @@
 import 'vs/css!./contextview';
 import { Builder, $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 
 export interface IAnchor {
 	x: number;
@@ -116,11 +116,9 @@ export class ContextView {
 		this.$view = $('.context-view').hide();
 		this.setContainer(container);
 
-		this.toDispose = [{
-			dispose: () => {
-				this.setContainer(null);
-			}
-		}];
+		this.toDispose = [toDisposable(() => {
+			this.setContainer(null);
+		})];
 
 		this.toDisposeOnClean = null;
 	}

src/vs/workbench/browser/parts/statusbar/statusbarPart.ts

@@ -9,7 +9,7 @@ import 'vs/css!./media/statusbarpart';
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { $ } from 'vs/base/browser/builder';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -86,15 +86,13 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			container.appendChild(el);
 		}
 
-		return {
-			dispose: () => {
-				$(el).destroy();
+		return toDisposable(() => {
+			$(el).destroy();
 
-				if (toDispose) {
-					toDispose.dispose();
-				}
+			if (toDispose) {
+				toDispose.dispose();
 			}
-		};
+		});
 	}
 
 	private getEntries(alignment: StatusbarAlignment): HTMLElement[] {

src/vs/workbench/services/decorations/browser/decorationsService.ts

@@ -8,7 +8,7 @@ import URI from 'vs/base/common/uri';
 import { Event, Emitter, debounceEvent, anyEvent } from 'vs/base/common/event';
 import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from './decorations';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { isThenable } from 'vs/base/common/async';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom';
@@ -402,15 +402,13 @@ export class FileDecorationsService implements IDecorationsService {
 			affectsResource() { return true; }
 		});
 
-		return {
-			dispose: () => {
-				// fire event that says 'yes' for any resource
-				// known to this provider. then dispose and remove it.
-				remove();
-				this._onDidChangeDecorations.fire({ affectsResource: uri => wrapper.knowsAbout(uri) });
-				wrapper.dispose();
-			}
-		};
+		return toDisposable(() => {
+			// fire event that says 'yes' for any resource
+			// known to this provider. then dispose and remove it.
+			remove();
+			this._onDidChangeDecorations.fire({ affectsResource: uri => wrapper.knowsAbout(uri) });
+			wrapper.dispose();
+		});
 	}
 
 	getDecoration(uri: URI, includeChildren: boolean, overwrite?: IDecorationData): IDecoration {

src/vs/workbench/services/extensions/electron-browser/extensionHost.ts

@@ -31,7 +31,7 @@ import { ICrashReporterService } from 'vs/workbench/services/crashReporter/elect
 import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-browser/broadcastService';
 import { isEqual } from 'vs/base/common/paths';
 import { EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
 import { getScopes } from 'vs/platform/configuration/common/configurationRegistry';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -96,11 +96,9 @@ export class ExtensionHostProcessWorker {
 
 		const globalExitListener = () => this.terminate();
 		process.once('exit', globalExitListener);
-		this._toDispose.push({
-			dispose: () => {
-				process.removeListener('exit', globalExitListener);
-			}
-		});
+		this._toDispose.push(toDisposable(() => {
+			process.removeListener('exit', globalExitListener);
+		}));
 	}
 
 	public dispose(): void {