Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula

src/vs/platform/lifecycle/common/lifecycle.ts

@@ -47,8 +47,9 @@ export enum StartupKind {
 
 export enum LifecyclePhase {
 	Starting = 1,
-	Running = 2,
-	ShuttingDown = 3
+	Restoring = 2,
+	Running = 3,
+	Eventually = 4
 }
 
 /**
@@ -70,9 +71,10 @@ export interface ILifecycleService {
 	readonly phase: LifecyclePhase;
 
 	/**
-	 * An event that fire when the lifecycle phase has changed
+	 * Returns a promise that resolves when a certain lifecycle phase
+	 * has started.
 	 */
-	readonly onDidChangePhase: Event<LifecyclePhase>;
+	when(phase: LifecyclePhase): Thenable<void>;
 
 	/**
 	 * Fired before shutdown happens. Allows listeners to veto against the
@@ -92,8 +94,8 @@ export interface ILifecycleService {
 export const NullLifecycleService: ILifecycleService = {
 	_serviceBrand: null,
 	phase: LifecyclePhase.Running,
+	when() { return Promise.resolve(); },
 	startupKind: StartupKind.NewWindow,
-	onDidChangePhase: Event.None,
 	onWillShutdown: Event.None,
 	onShutdown: Event.None
 };
@@ -127,4 +129,4 @@ export function handleVetos(vetos: (boolean | TPromise<boolean>)[], onError: (er
 	}
 
 	return TPromise.join(promises).then(() => lazyValue);
-}
+}