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/platform/storage/common/storageService.ts

@@ -8,6 +8,7 @@ import types = require('vs/base/common/types');
 import errors = require('vs/base/common/errors');
 import strings = require('vs/base/common/strings');
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import * as perf from 'vs/base/common/performance';
 
 // Browser localStorage interface
 export interface IStorage {
@@ -89,7 +90,9 @@ export class StorageService implements IStorageService {
 	private cleanupWorkspaceScope(workspaceUid: number): void {
 
 		// Get stored identifier from storage
+		perf.mark('willReadWorkspaceIdentifier');
 		const id = this.getInteger(StorageService.WORKSPACE_IDENTIFIER, StorageScope.WORKSPACE);
+		perf.mark('didReadWorkspaceIdentifier');
 
 		// If identifier differs, assume the workspace got recreated and thus clean all storage for this workspace
 		if (types.isNumber(id) && workspaceUid !== id) {

src/vs/platform/storage/test/browser/migration.test.ts

@@ -13,7 +13,6 @@ import { StorageScope } from 'vs/platform/storage/common/storage';
 import { startsWith } from 'vs/base/common/strings';
 
 suite('Storage Migration', () => {
-
 	test('Parse Storage (Global)', () => {
 	});
 });