Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/vs/workbench/services/timer/common/timerService.ts

@@ -66,6 +66,7 @@ export interface IStartupMetrics {
 		ellapsedEditorRestore: number;
 		ellapsedWorkbench: number;
 		ellapsedTimersToTimersComputed: number;
+		ellapsedNlsGeneration: number;
 	};
 	platform: string;
 	release: string;
@@ -83,14 +84,7 @@ export interface IStartupMetrics {
 
 export interface IInitData {
 	start: number;
-
-	appReady: number;
-
 	windowLoad: number;
-
-	beforeLoadWorkbenchMain: number;
-	afterLoadWorkbenchMain: number;
-
 	isInitialStartup: boolean;
 	hasAccessibilitySupport: boolean;
 }
@@ -98,17 +92,5 @@ export interface IInitData {
 export interface ITimerService extends IInitData {
 	_serviceBrand: any;
 
-	beforeDOMContentLoaded: number;
-	afterDOMContentLoaded: number;
-
-	beforeWorkbenchOpen: number;
-	workbenchStarted: number;
-
-	beforeExtensionLoad: number;
-	afterExtensionLoad: number;
-
-	restoreViewletDuration: number;
-	restoreEditorsDuration: number;
-
 	readonly startupMetrics: IStartupMetrics;
 }