debt - remove one Promise.join overload, microsoft#53526

jrieken · jrieken · commit e0a5cf18ce6e · 2018-07-04T14:47:23.000+02:00
diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts
@@ -39,7 +39,6 @@ export declare class Promise<T = any, TProgress = any> {
 
 	public static join<T1, T2>(promises: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
 	public static join<T>(promises: (T | PromiseLike<T>)[]): Promise<T[]>;
-	public static join<T>(promises: { [n: string]: T | PromiseLike<T> }): Promise<{ [n: string]: T }>;
 
 	public static any<T>(promises: (T | PromiseLike<T>)[]): Promise<{ key: string; value: Promise<T>; }>;
 
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -284,7 +284,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 				}
 			}).then(null, err => [] /* never fail this call */);
 
-		return bulkContentFetchromise.then(() => TPromise.join(workspaceFilePathToConfiguration).then(result => collections.values(result)));
+		return bulkContentFetchromise.then(() => TPromise.join(collections.values(workspaceFilePathToConfiguration)));
 	}
 
 	private handleWorkspaceFileEvents(event: FileChangesEvent): void {
@@ -489,4 +489,4 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		}
 		return TPromise.as(null);
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura`
`284`	`284`	`}`
`285`	`285`	`}).then(null, err => [] /* never fail this call */);`
`286`	`286`
`287`		`- return bulkContentFetchromise.then(() => TPromise.join(workspaceFilePathToConfiguration).then(result => collections.values(result)));`
	`287`	`+ return bulkContentFetchromise.then(() => TPromise.join(collections.values(workspaceFilePathToConfiguration)));`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`private handleWorkspaceFileEvents(event: FileChangesEvent): void {`
`@@ -489,4 +489,4 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat`
`489`	`489`	`}`
`490`	`490`	`return TPromise.as(null);`
`491`	`491`	`}`
`492`		`-}`
	`492`	`+}`