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

@@ -49,13 +49,7 @@ export interface IMemoryInfo {
"hasAccessibilitySupport" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"isVMLikelyhood" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"emptyWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"${wildcard}": [
{
"${prefix}": "timers2.",
"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
]
"loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
export interface IStartupMetrics {
@@ -73,7 +67,6 @@ export interface IStartupMetrics {
ellapsedWorkbench: number;
ellapsedTimersToTimersComputed: number;
};
timers2: { [name: string]: number };
platform: string;
release: string;
arch: string;

View File

@@ -6,7 +6,6 @@
import { ITimerService, IStartupMetrics, IInitData, IMemoryInfo } from 'vs/workbench/services/timer/common/timerService';
import { virtualMachineHint } from 'vs/base/node/id';
import { ticks } from 'vs/base/node/startupTimers';
import * as os from 'os';
@@ -89,13 +88,7 @@ export class TimerService implements ITimerService {
cpus = { count: rawCpus.length, speed: rawCpus[0].speed, model: rawCpus[0].model };
}
} catch (error) {
console.error(error); // be on the safe side with these hardware method calls
}
// fill in startup timers we have until now
const timers2: { [name: string]: number } = Object.create(null);
for (const tick of ticks()) {
timers2[tick.name] = tick.duration;
// ignore, be on the safe side with these hardware method calls
}
this._startupMetrics = {
@@ -111,7 +104,6 @@ export class TimerService implements ITimerService {
ellapsedWindowLoadToRequire: this.beforeLoadWorkbenchMain - this.windowLoad,
ellapsedTimersToTimersComputed: Date.now() - now
},
timers2,
platform,
release,
arch,