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/telemetry/test/electron-browser/commonProperties.test.ts

@@ -49,15 +49,16 @@ suite('Telemetry - common properties', function () {
 				// assert.ok('common.version.shell' in first.data); // only when running on electron
 				// assert.ok('common.version.renderer' in first.data);
 				assert.ok('common.osVersion' in props, 'osVersion');
+				assert.ok('common.platformVersion' in props, 'platformVersion');
 				assert.ok('version' in props);
 				assert.equal(props['common.source'], 'my.install.source');
 
 			// {{SQL CARBON EDIT}}
 			assert.ok('common.application.name' in props);
 
-			assert.ok('common.firstSessionDate' in props, 'firstSessionDate');
-			assert.ok('common.lastSessionDate' in props, 'lastSessionDate'); // conditional, see below, 'lastSessionDate'ow
-			assert.ok('common.isNewSession' in props, 'isNewSession');
+				assert.ok('common.firstSessionDate' in props, 'firstSessionDate');
+				assert.ok('common.lastSessionDate' in props, 'lastSessionDate'); // conditional, see below, 'lastSessionDate'ow
+				assert.ok('common.isNewSession' in props, 'isNewSession');
 
 				// machine id et al
 				assert.ok('common.instanceId' in props, 'instanceId');