adopt Promise.finally (for microsoft#67027)

Benjamin Pasero · Benjamin Pasero · commit cee47d0f3ed0 · 2019-01-24T09:31:49.000+01:00
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -12,7 +12,6 @@ import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
 import { handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
 import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { always } from 'vs/base/common/async';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
@@ -202,7 +201,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 			const shutdownPromise = this.beginOnWillShutdown();
 
 			// Wait until shutdown is signaled to be complete
-			always(shutdownPromise, () => {
+			shutdownPromise.finally(() => {
 
 				// Resolve pending quit promise now without veto
 				this.resolvePendingQuitPromise(false /* no veto */);
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -23,7 +23,6 @@ import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ISerializedEditorGroup, isSerializedEditorGroup } from 'vs/workbench/common/editor/editorGroup';
-import { always } from 'vs/base/common/async';
 import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTarget';
 import { localize } from 'vs/nls';
 import { Color } from 'vs/base/common/color';
@@ -829,7 +828,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		}
 
 		// Signal restored
-		always(Promise.all(this.groups.map(group => group.whenRestored)), () => this.whenRestoredResolve());
+		Promise.all(this.groups.map(group => group.whenRestored)).finally(() => this.whenRestoredResolve());
 
 		// Update container
 		this.updateContainer();
diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts
@@ -30,7 +30,6 @@ import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { coalesce } from 'vs/base/common/arrays';
-import { always } from 'vs/base/common/async';
 
 /**
  * Stores the selection & view state of an editor and allows to compare it to other selection states.
@@ -408,7 +407,7 @@ export class HistoryService extends Disposable implements IHistoryService {
 	private navigate(acrossEditors?: boolean): void {
 		this.navigatingInStack = true;
 
-		always(this.doNavigate(this.stack[this.index], !acrossEditors), () => this.navigatingInStack = false);
+		this.doNavigate(this.stack[this.index], !acrossEditors).finally(() => this.navigatingInStack = false);
 	}
 
 	private doNavigate(location: IStackEntry, withSelection: boolean): Promise<IBaseEditor> {
