Vscode merge (#4582)

* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies

src/vs/platform/url/common/urlService.ts

@@ -8,10 +8,11 @@ import { URI } from 'vs/base/common/uri';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { first } from 'vs/base/common/async';
 import { values } from 'vs/base/common/map';
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export class URLService implements IURLService {
 
-	_serviceBrand: any;
+	_serviceBrand: ServiceIdentifier<any>;
 
 	private handlers = new Set<IURLHandler>();
 
@@ -25,18 +26,3 @@ export class URLService implements IURLService {
 		return toDisposable(() => this.handlers.delete(handler));
 	}
 }
-
-export class RelayURLService extends URLService implements IURLHandler {
-
-	constructor(private urlService: IURLService) {
-		super();
-	}
-
-	open(uri: URI): Promise<boolean> {
-		return this.urlService.open(uri);
-	}
-
-	handleURL(uri: URI): Promise<boolean> {
-		return super.open(uri);
-	}
-}

src/vs/platform/url/electron-browser/urlService.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
+import { URI } from 'vs/base/common/uri';
+import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
+import { URLServiceChannelClient, URLHandlerChannel } from 'vs/platform/url/node/urlIpc';
+import { URLService } from 'vs/platform/url/common/urlService';
+
+export class RelayURLService extends URLService implements IURLHandler {
+	private urlService: IURLService;
+
+	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
+		super();
+
+		this.urlService = new URLServiceChannelClient(mainProcessService.getChannel('url'));
+
+		mainProcessService.registerChannel('urlHandler', new URLHandlerChannel(this));
+	}
+
+	open(uri: URI): Promise<boolean> {
+		return this.urlService.open(uri);
+	}
+
+	handleURL(uri: URI): Promise<boolean> {
+		return super.open(uri);
+	}
+}

src/vs/platform/url/electron-main/electronUrlListener.ts

@@ -5,7 +5,7 @@
 
 import { Event } from 'vs/base/common/event';
 import { IURLService } from 'vs/platform/url/common/url';
-import product from 'vs/platform/node/product';
+import product from 'vs/platform/product/node/product';
 import { app } from 'electron';
 import { URI } from 'vs/base/common/uri';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';

src/vs/platform/url/node/urlIpc.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { URI } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';