https-githubsup-com
diff --git a/‎src/vs/workbench/services/extensions/electron-browser/extensionService.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/vs/workbench/services/extensions/electron-browser/extensionService.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/vs/workbench/services/extensions/electron-browser/webWorkerExtensionHostStarter.ts‎
Lines changed: 11 additions & 5 deletions b/‎src/vs/workbench/services/extensions/electron-browser/webWorkerExtensionHostStarter.ts‎
Lines changed: 11 additions & 5 deletions
@@ -350,7 +350,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		}
 
 		const result: ExtensionHostProcessManager[] = [];
-		const workerExtensions = { ['jrieken.helloworld']: true };
+		const workerExtensions: Record<string, true> = { ['jrieken.helloworld']: true };
 
 		const extHostProcessWorker = this._instantiationService.createInstance(ExtensionHostProcessWorker, autoStart, extensions.then(e => e.filter(e => !workerExtensions[e.identifier.value])), this._extensionHostLogsLocation);
 		const extHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, true, extHostProcessWorker, null, initialActivationEvents);
 
@@ -17,12 +17,12 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import * as platform from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { IExtensionHostStarter } from 'vs/workbench/services/extensions/common/extensions';
 import { IProductService } from 'vs/platform/product/common/product';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export class WebWorkerExtensionHostStarter implements IExtensionHostStarter {
 
@@ -41,7 +41,7 @@ export class WebWorkerExtensionHostStarter implements IExtensionHostStarter {
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@ILabelService private readonly _labelService: ILabelService,
 		@ILogService private readonly _logService: ILogService,
-		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
 		@IProductService private readonly _productService: IProductService,
 	) {
 
@@ -121,14 +121,16 @@ export class WebWorkerExtensionHostStarter implements IExtensionHostStarter {
 					environment: {
 						isExtensionDevelopmentDebug: false, // < todo@joh
 						appRoot: this._environmentService.appRoot ? URI.file(this._environmentService.appRoot) : undefined,
-						appSettingsHome: this._environmentService.appSettingsHome ? URI.file(this._environmentService.appSettingsHome) : undefined,
+						appSettingsHome: this._environmentService.appSettingsHome ? this._environmentService.appSettingsHome : undefined,
 						appName: this._productService.nameLong,
 						appUriScheme: this._productService.urlProtocol,
 						appLanguage: platform.language,
 						extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
 						extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
 						globalStorageHome: URI.file(this._environmentService.globalStorageHome),
-						userHome: URI.file(this._environmentService.userHome)
+						userHome: URI.file(this._environmentService.userHome),
+						webviewResourceRoot: this._environmentService.webviewResourceRoot,
+						webviewCspSource: this._environmentService.webviewCspSource,
 					},
 					workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? undefined : {
 						configuration: workspace.configuration || undefined,
@@ -141,7 +143,11 @@ export class WebWorkerExtensionHostStarter implements IExtensionHostStarter {
 					telemetryInfo,
 					logLevel: this._logService.getLevel(),
 					logsLocation: this._extensionHostLogsLocation,
-					autoStart: true// < todo@joh this._autoStart
+					autoStart: true,// < todo@joh this._autoStart,
+					remote: {
+						authority: this._environmentService.configuration.remoteAuthority,
+						isRemote: false
+					},
 				};
 				return r;
 			});
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`const result: ExtensionHostProcessManager[] = [];`
`353`		`- const workerExtensions = { ['jrieken.helloworld']: true };`
	`353`	`+ const workerExtensions: Record<string, true> = { ['jrieken.helloworld']: true };`
`354`	`354`
`355`	`355`	`const extHostProcessWorker = this._instantiationService.createInstance(ExtensionHostProcessWorker, autoStart, extensions.then(e => e.filter(e => !workerExtensions[e.identifier.value])), this._extensionHostLogsLocation);`
`356`	`356`	`const extHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, true, extHostProcessWorker, null, initialActivationEvents);`