fix lifecycle

src/vs/base/common/lifecycle.ts

@@ -14,19 +14,17 @@ export interface IDisposable {
 	dispose(): void;
 }
 
-export function dispose<T extends IDisposable>(disposable: T): T;
+export function dispose<T extends IDisposable>(...disposables: T[]): T;
 export function dispose<T extends IDisposable>(disposables: T[]): T[];
-export function dispose<T extends IDisposable>(...disposables: T[]): T[];
-export function dispose<T extends IDisposable>(arg: any): T[] {
-	if (isArray(arg)) {
-		const disposables: T[] = arg;
-		disposables.forEach(d => d && d.dispose());
-		return [];
+export function dispose<T extends IDisposable>(...disposables: T[]): T[] {
+	const first = disposables[0];
+
+	if (isArray(first)) {
+		disposables = first as any as T[];
 	}
 
-	const disposable: T = arg;
-	disposable.dispose();
-	return null;
+	disposables.forEach(d => d && d.dispose());
+	return [];
 }
 
 export function combinedDisposable(disposables: IDisposable[]): IDisposable;

src/vs/base/test/common/lifecycle.test.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+class Disposable implements IDisposable {
+	isDisposed = false;
+	dispose() { this.isDisposed = true; }
+}
+
+suite('Lifecycle', () => {
+
+	test('dispose single disposable', () => {
+		const disposable = new Disposable();
+
+		assert(!disposable.isDisposed);
+
+		dispose(disposable);
+
+		assert(disposable.isDisposed);
+	});
+
+	test('dispose disposable array', () => {
+		const disposable = new Disposable();
+		const disposable2 = new Disposable();
+
+		assert(!disposable.isDisposed);
+		assert(!disposable2.isDisposed);
+
+		dispose([disposable, disposable2]);
+
+		assert(disposable.isDisposed);
+		assert(disposable2.isDisposed);
+	});
+
+	test('dispose disposables', () => {
+		const disposable = new Disposable();
+		const disposable2 = new Disposable();
+
+		assert(!disposable.isDisposed);
+		assert(!disposable2.isDisposed);
+
+		dispose(disposable, disposable2);
+
+		assert(disposable.isDisposed);
+		assert(disposable2.isDisposed);
+	});
+});
\ No newline at end of file