_vscodeSystemProxy option (#60773)

This commit is contained in:
Christof Marti
2018-10-29 15:09:48 +01:00
parent 1a1c4979d7
commit c391faf35a
3 changed files with 38 additions and 28 deletions

View File

@@ -20,6 +20,7 @@ import { ExtHostStorage } from 'vs/workbench/api/node/extHostStorage';
import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry';
import { connectProxyResolver } from 'vs/workbench/node/proxyResolver';
class ExtensionMemento implements IExtensionMemento {
@@ -163,6 +164,9 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
const apiFactory = createApiFactory(initData, extHostContext, extHostWorkspace, extHostConfiguration, this, this._extHostLogService, this._storage);
initializeExtensionApi(this, apiFactory).then(() => {
// Do this when extension service exists, but extensions are not being activated yet.
return connectProxyResolver(extHostWorkspace, extHostConfiguration, this, this._extHostLogService, this._mainThreadTelemetry);
}).then(() => {
this._activator = new ExtensionsActivator(this._registry, {
showMessage: (severity: Severity, message: string): void => {