Fix #60203 - VSCODE_NODE_CACHED_DATA_DIR can be inherited from the DA process. If --no-cached-data is passed, that var should be cleared

This commit is contained in:
Rob Lourens 2018-10-18 08:59:20 -07:00
parent b58e07b1cf
commit 49ba5a4b9c
2 changed files with 2 additions and 5 deletions

2
.vscode/launch.json vendored
View file

@ -147,7 +147,7 @@
}, },
"urlFilter": "*workbench.html*", "urlFilter": "*workbench.html*",
"runtimeArgs": [ "runtimeArgs": [
"--inspect=5875" "--inspect=5875", "--no-cached-data"
], ],
"smartStep": true, "smartStep": true,
"skipFiles": [ "skipFiles": [

View file

@ -88,10 +88,7 @@ function onReady() {
const startup = nlsConfig => { const startup = nlsConfig => {
nlsConfig._languagePackSupport = true; nlsConfig._languagePackSupport = true;
process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig); process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
process.env['VSCODE_NODE_CACHED_DATA_DIR'] = cachedDataDir || '';
if (cachedDataDir) {
process.env['VSCODE_NODE_CACHED_DATA_DIR'] = cachedDataDir;
}
// Load main in AMD // Load main in AMD
require('./bootstrap-amd').load('vs/code/electron-main/main'); require('./bootstrap-amd').load('vs/code/electron-main/main');