diff --git a/src/vs/code/electron-browser/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess.js index b28716a7ceae60c1cb20b212d71a5043d135a536..f95a5984dd8544ffb7913ee7b4dad4605fd8af13 100644 --- a/src/vs/code/electron-browser/sharedProcess.js +++ b/src/vs/code/electron-browser/sharedProcess.js @@ -51,9 +51,6 @@ function main() { const args = parseURLQueryArgs(); const configuration = JSON.parse(args['config'] || '{}') || {}; - // Correctly inherit the parent's environment - assign(process.env, configuration.userEnv); - // Get the nls configuration into the process.env as early as possible. var nlsConfig = { availableLanguages: {} }; const config = process.env['VSCODE_NLS_CONFIG']; @@ -98,9 +95,7 @@ function main() { }); } - require(['vs/code/electron-browser/sharedProcessMain'], function () { - - }); + require(['vs/code/electron-browser/sharedProcessMain'], function () { }); }); } diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 9912806456fa8eb4cb9ac2b0d96ae5cf39f0bc93..fddf71b339406b595f8a61cbd7dbf88dd314bea2 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -144,7 +144,7 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: platfo // Spawn shared process const initData = { args: environmentService.args }; - const sharedProcess = spawnSharedProcess(initData) + const sharedProcess = spawnSharedProcess(initData, environmentService.appRoot, environmentService.nodeCachedDataDir) .then(disposable => connect(environmentService.sharedIPCHandle, 'main')); // Create a new service collection, because the telemetry service diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index 66c7a783cf29c1527176620da145350a8fec3258..e5b25b54ce81250be1c31c6c215d295887cd26e5 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -12,18 +12,14 @@ export interface ISharedProcessInitData { args: ParsedArgs; } -export function spawnSharedProcess(initData: ISharedProcessInitData): TPromise { +export function spawnSharedProcess(initData: ISharedProcessInitData, appRoot: string, nodeCachedDataDir: string): TPromise { const window = new BrowserWindow(); - const config = assign({ - userEnv: {}, - appRoot: '', - nodeCachedDataDir: '' - }); + const config = assign({ appRoot, nodeCachedDataDir }); const url = `${require.toUrl('vs/code/electron-browser/sharedProcess.html')}?config=${encodeURIComponent(JSON.stringify(config))}`; window.loadURL(url); - // window.hide(); window.webContents.openDevTools(); + // window.hide(); // Prevent the window from dying window.on('close', e => {