Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

6
src/bootstrap.js vendored
View File

@@ -203,7 +203,7 @@ exports.setupNLS = function () {
const bundles = Object.create(null);
nlsConfig.loadBundle = function (bundle, language, cb) {
let result = bundles[bundle];
const result = bundles[bundle];
if (result) {
cb(undefined, result);
@@ -212,7 +212,7 @@ exports.setupNLS = function () {
const bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
exports.readFile(bundleFile).then(function (content) {
let json = JSON.parse(content);
const json = JSON.parse(content);
bundles[bundle] = json;
cb(undefined, json);
@@ -301,4 +301,4 @@ exports.avoidMonkeyPatchFromAppInsights = function () {
process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] = true; // Skip monkey patching of 3rd party modules by appinsights
global['diagnosticsSource'] = {}; // Prevents diagnostic channel (which patches "require") from initializing entirely
};
//#endregion
//#endregion