Skip to content

Commit a9b627e

Browse files
authored
enable main request service in insiders (microsoft#167190)
1 parent 89a91f0 commit a9b627e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class SharedProcessMain extends Disposable {
277277
services.set(IUriIdentityService, new UriIdentityService(fileService));
278278

279279
// Request
280-
services.set(IRequestService, new SharedProcessRequestService(mainProcessService, configurationService, logService));
280+
services.set(IRequestService, new SharedProcessRequestService(mainProcessService, configurationService, productService, logService));
281281

282282
// Checksum
283283
services.set(IChecksumService, new SyncDescriptor(ChecksumService, undefined, false /* proxied to other processes */));

src/vs/platform/request/electron-browser/sharedProcessRequestService.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { CancellationToken } from 'vs/base/common/cancellation';
7+
import { isBoolean } from 'vs/base/common/types';
78
import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
89
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
910
import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
1011
import { ILogService } from 'vs/platform/log/common/log';
12+
import { IProductService } from 'vs/platform/product/common/productService';
1113
import { RequestService } from 'vs/platform/request/browser/requestService';
1214
import { IRequestService } from 'vs/platform/request/common/request';
1315
import { RequestChannelClient } from 'vs/platform/request/common/requestIpc';
@@ -22,6 +24,7 @@ export class SharedProcessRequestService implements IRequestService {
2224
constructor(
2325
mainProcessService: IMainProcessService,
2426
private readonly configurationService: IConfigurationService,
27+
private readonly productService: IProductService,
2528
private readonly logService: ILogService,
2629
) {
2730
this.browserRequestService = new RequestService(configurationService, logService);
@@ -37,11 +40,19 @@ export class SharedProcessRequestService implements IRequestService {
3740
}
3841

3942
private getRequestService(): IRequestService {
40-
if (this.configurationService.getValue('developer.sharedProcess.redirectRequestsToMain') === true) {
43+
if (this.isMainRequestServiceEnabled()) {
4144
this.logService.trace('Using main request service');
4245
return this.mainRequestService;
4346
}
4447
this.logService.trace('Using browser request service');
4548
return this.browserRequestService;
4649
}
50+
51+
private isMainRequestServiceEnabled(): boolean {
52+
const value = this.configurationService.getValue('developer.sharedProcess.redirectRequestsToMain');
53+
if (isBoolean(value)) {
54+
return value;
55+
}
56+
return this.productService.quality !== 'stable';
57+
}
4758
}

0 commit comments

Comments
 (0)