Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Investigate using Electron's resolveProxy API (#60773)

Browse Source
This commit is contained in:
Christof Marti
2018-10-22 20:00:47 +02:00
parent 53d48f4c2c
commit 4e436d128c
15 changed files with 298 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
View File

@@ -40,6 +40,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@IConfigurationService private readonly _configurationService: IConfigurationService,
@IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService,
@IStatusbarService private readonly _statusbarService: IStatusbarService,
@IWindowService private readonly _windowService: IWindowService,
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@ILabelService private readonly _labelService: ILabelService
) {
@@ -231,6 +232,10 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
return result.results.every(each => each.success === true);
});
}
$resolveProxy(url: string): Thenable<string> {
return this._windowService.resolveProxy(url);
}
}
CommandsRegistry.registerCommand('_workbench.enterWorkspace', async function (accessor: ServicesAccessor, workspace: URI, disableExtensions: string[]) {

1
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -487,6 +487,7 @@ export interface MainThreadWorkspaceShape extends IDisposable {
$checkExists(includes: string[], token: CancellationToken): Thenable<boolean>;
$saveAll(includeUntitled?: boolean): Thenable<boolean>;
$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string }[]): Thenable<void>;
$resolveProxy(url: string): Thenable<string>;
}
export interface IFileChangeDto {

5
src/vs/workbench/api/node/extHostExtensionService.ts
View File

@@ -147,12 +147,13 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
extHostContext: IMainContext,
extHostWorkspace: ExtHostWorkspace,
extHostConfiguration: ExtHostConfiguration,
extHostLogService: ExtHostLogService
extHostLogService: ExtHostLogService,
mainThreadTelemetry: MainThreadTelemetryShape
) {
this._barrier = new Barrier();
this._registry = new ExtensionDescriptionRegistry(initData.extensions);
this._extHostLogService = extHostLogService;
this._mainThreadTelemetry = extHostContext.getProxy(MainContext.MainThreadTelemetry);
this._mainThreadTelemetry = mainThreadTelemetry;
this._storage = new ExtHostStorage(extHostContext);
this._storagePath = new ExtensionStoragePath(initData.workspace, initData.environment);
this._proxy = extHostContext.getProxy(MainContext.MainThreadExtensionService);

4
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -454,4 +454,8 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
saveAll(includeUntitled?: boolean): Thenable<boolean> {
return this._proxy.$saveAll(includeUntitled);
}
resolveProxy(url: string): Thenable<string> {
return this._proxy.$resolveProxy(url);
}
}