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/api/electron-browser/mainThreadDiagnostics.ts

@@ -5,8 +5,7 @@
 'use strict';
 
 import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers';
-import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import { MainThreadDiagnosticsShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
@@ -27,18 +26,16 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 		this._activeOwners.forEach(owner => this._markerService.changeAll(owner, undefined));
 	}
 
-	$changeMany(owner: string, entries: [URI, IMarkerData[]][]): TPromise<any> {
+	$changeMany(owner: string, entries: [UriComponents, IMarkerData[]][]): void {
 		for (let entry of entries) {
 			let [uri, markers] = entry;
-			this._markerService.changeOne(owner, uri, markers);
+			this._markerService.changeOne(owner, URI.revive(uri), markers);
 		}
 		this._activeOwners.add(owner);
-		return undefined;
 	}
 
-	$clear(owner: string): TPromise<any> {
+	$clear(owner: string): void {
 		this._markerService.changeAll(owner, undefined);
 		this._activeOwners.delete(owner);
-		return undefined;
 	}
 }