Skip to content

Commit

Permalink
Revert "processes.env.addDelayedEnvironment, microsoft#16508"
Browse files Browse the repository at this point in the history
This reverts commit 3e6c59c.
  • Loading branch information
jrieken committed Dec 20, 2016
1 parent 1d5751a commit e3f33fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 50 deletions.
36 changes: 1 addition & 35 deletions src/vs/base/node/processes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,38 +485,4 @@ 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);
}
}
};
}
16 changes: 1 addition & 15 deletions src/vs/base/test/node/processes/processes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ 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');

Expand Down Expand Up @@ -83,17 +82,4 @@ 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);
});
});
});
});

0 comments on commit e3f33fd

Please sign in to comment.