processes.env.addDelayedEnvironment, microsoft#16508

jrieken · jrieken · commit 3e6c59cdaa1a · 2016-12-20T11:08:39.000+01:00
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
@@ -485,4 +485,38 @@ export function createQueuedSender(childProcess: ChildProcess | NodeJS.Process):
 	};
 
 	return { send };
-}
+}
+
+
+export interface IEnv {
+	addDelayedEnvironment(promise: TPromise<typeof process.env>): any;
+	ready: TPromise<void>;
+}
+
+export const env: IEnv = new class {
+
+	private _promises: TPromise<any>[] = [];
+
+	addDelayedEnvironment(promise: TPromise<typeof process.env>): any {
+		const p = TPromise.wrap(promise).then(env => {
+			// mixin new env
+			Objects.mixin(process.env, env, true);
+		});
+		this._promises.push(p);
+		const remove = () => {
+			const idx = this._promises.indexOf(p);
+			if (idx >= 0) {
+				this._promises.splice(idx, 1);
+			}
+		};
+		p.then(remove, remove);
+	}
+
+	get ready(): TPromise<void> {
+		if (this._promises.length === 0) {
+			return TPromise.as(undefined);
+		} else {
+			return TPromise.join(this._promises).then(() => this.ready);
+		}
+	}
+};
diff --git a/src/vs/base/test/node/processes/processes.test.ts b/src/vs/base/test/node/processes/processes.test.ts
@@ -9,6 +9,7 @@ import * as assert from 'assert';
 import * as cp from 'child_process';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
+import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import processes = require('vs/base/node/processes');
 
@@ -82,4 +83,17 @@ suite('Processes', () => {
 			}
 		});
 	});
-});
+
+	test('env, ready by default', function () {
+		return processes.env.ready.then(() => {
+			assert.ok(true);
+		});
+	});
+
+	test('env, delayed', function () {
+		processes.env.addDelayedEnvironment(TPromise.as({ foo: 1 }));
+		return processes.env.ready.then(() => {
+			assert.equal(process.env.foo, 1);
+		});
+	});
+});
