debt - remove resolveProxy from window service

This commit is contained in:
Benjamin Pasero
2019-09-19 18:19:16 +02:00
parent a55b7ecf69
commit 3334b82562
19 changed files with 71 additions and 58 deletions

View File

@@ -9,9 +9,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { ILogService } from 'vs/platform/log/common/log';
import { RequestChannelClient } from 'vs/platform/request/common/requestIpc';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { RequestService as BrowserRequestService } from 'vs/platform/request/browser/requestService';
import { RequestService } from 'vs/platform/request/browser/requestService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IRequestService } from 'vs/platform/request/common/request';
export class RequestService extends BrowserRequestService {
export class BrowserRequestService extends RequestService {
private readonly remoteRequestChannel: RequestChannelClient | null;
@@ -40,5 +42,6 @@ export class RequestService extends BrowserRequestService {
throw error;
}
}
}
registerSingleton(IRequestService, BrowserRequestService, true);

View File

@@ -0,0 +1,28 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ILogService } from 'vs/platform/log/common/log';
import { RequestService } from 'vs/platform/request/browser/requestService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IRequestService } from 'vs/platform/request/common/request';
import { IElectronService } from 'vs/platform/electron/node/electron';
export class NativeRequestService extends RequestService {
constructor(
@IConfigurationService configurationService: IConfigurationService,
@ILogService logService: ILogService,
@IElectronService private electronService: IElectronService
) {
super(configurationService, logService);
}
async resolveProxy(url: string): Promise<string | undefined> {
return this.electronService.resolveProxy(url);
}
}
registerSingleton(IRequestService, NativeRequestService, true);