Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -5,12 +5,8 @@
'use strict';
if (process.argv.indexOf('--prof-startup') >= 0) {
var profiler = require('v8-profiler');
var prefix = require('crypto').randomBytes(2).toString('hex');
process.env.VSCODE_PROFILES_PREFIX = prefix;
profiler.startProfiling('main', true);
}
var perf = require('./vs/base/common/performance');
perf.mark('main:started');
// Perf measurements
global.perfStartTime = Date.now();
@@ -119,6 +115,10 @@ function getNLSConfiguration() {
}
function getNodeCachedDataDir() {
// flag to disable cached data support
if (process.argv.indexOf('--no-cached-data') > 0) {
return Promise.resolve(undefined);
}
// IEnvironmentService.isBuilt
if (process.env['VSCODE_DEV']) {
@@ -218,6 +218,7 @@ var nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
// Load our code once ready
app.once('ready', function () {
perf.mark('main:appReady');
global.perfAppReady = Date.now();
var nlsConfig = getNLSConfiguration();
process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);