From 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 11 Feb 2020 07:33:38 +0100 Subject: [PATCH] Web: extension recommendations are not working (fix #90421) --- .../electron-browser/sharedProcess/sharedProcessMain.ts | 2 +- src/vs/code/node/cliProcessMain.ts | 2 +- .../services/environment/browser/environmentService.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 9a55bbde2f9..27d4cc05629 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -157,7 +157,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat instantiationService.invokeFunction(accessor => { const services = new ServiceCollection(); const environmentService = accessor.get(IEnvironmentService); - const { appRoot, extensionsPath, extensionDevelopmentLocationURI: extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService; + const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService; const telemetryLogService = new FollowerLogService(loggerClient, new SpdLogService('telemetry', environmentService.logsPath, initData.logLevel)); telemetryLogService.info('The below are logs for every telemetry event sent from VS Code once the log level is set to trace.'); telemetryLogService.info('==========================================================='); diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 2ba0de50620..a98b07f9452 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -331,7 +331,7 @@ export async function main(argv: ParsedArgs): Promise { const envService = accessor.get(IEnvironmentService); const stateService = accessor.get(IStateService); - const { appRoot, extensionsPath, extensionDevelopmentLocationURI: extensionDevelopmentLocationURI, isBuilt, installSourcePath } = envService; + const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = envService; const services = new ServiceCollection(); diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index 1bf4cfad2a3..b7ee69dc594 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -108,7 +108,7 @@ interface IBrowserWorkbenchEnvironmentConstructionOptions extends IWorkbenchCons interface IExtensionHostDebugEnvironment { params: IExtensionHostDebugParams; isExtensionDevelopment: boolean; - extensionDevelopmentLocationURI: URI[]; + extensionDevelopmentLocationURI?: URI[]; extensionTestsLocationURI?: URI; } @@ -177,7 +177,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment return this._extensionHostDebugEnvironment.isExtensionDevelopment; } - get extensionDevelopmentLocationURI(): URI[] { + get extensionDevelopmentLocationURI(): URI[] | undefined { if (!this._extensionHostDebugEnvironment) { this._extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment(); } @@ -289,7 +289,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment break: false }, isExtensionDevelopment: false, - extensionDevelopmentLocationURI: [] + extensionDevelopmentLocationURI: undefined }; // Fill in selected extra environmental properties