Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

src/vs/platform/request/browser/requestService.ts

@@ -8,12 +8,13 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { request } from 'vs/base/parts/request/browser/request';
+import { IRequestService } from 'vs/platform/request/common/request';
 
 /**
  * This service exposes the `request` API, while using the global
  * or configured proxy settings.
  */
-export class RequestService {
+export class RequestService implements IRequestService {
 
 	_serviceBrand: undefined;
 
@@ -32,4 +33,8 @@ export class RequestService {
 
 		return request(options, token);
 	}
+
+	async resolveProxy(url: string): Promise<string | undefined> {
+		return undefined; // not implemented in the web
+	}
 }

src/vs/platform/request/common/request.ts

@@ -17,6 +17,8 @@ export interface IRequestService {
 	_serviceBrand: undefined;
 
 	request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
+
+	resolveProxy(url: string): Promise<string | undefined>;
 }
 
 function isSuccess(context: IRequestContext): boolean {

src/vs/platform/request/node/requestService.ts

@@ -141,7 +141,9 @@ export class RequestService extends Disposable implements IRequestService {
 				e(canceled());
 			});
 		});
-
 	}
 
+	async resolveProxy(url: string): Promise<string | undefined> {
+		return undefined; // currently not implemented in node
+	}
 }