fix microsoft#65336

Benjamin Pasero · Benjamin Pasero · commit 3a6cd5786dfe · 2018-12-19T06:30:29.000+01:00
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
@@ -106,6 +106,8 @@ class ExpectedError extends Error {
 
 function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 	const logService = accessor.get(ILogService);
+	const environmentService = accessor.get(IEnvironmentService);
+	const instantiationService = accessor.get(IInstantiationService);
 
 	function allowSetForegroundWindow(service: LaunchChannelClient): Promise<void> {
 		let promise: Promise<void> = Promise.resolve();
@@ -127,8 +129,6 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 	}
 
 	function setup(retry: boolean): Promise<Server> {
-		const environmentService = accessor.get(IEnvironmentService);
-
 		return serve(environmentService.mainIPCHandle).then(server => {
 
 			// Print --status usage info
@@ -195,14 +195,18 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 					// Process Info
 					if (environmentService.args.status) {
 						return service.getMainProcessInfo().then(info => {
-							return accessor.get(IDiagnosticsService).printDiagnostics(info).then(() => Promise.reject(new ExpectedError()));
+							return instantiationService.invokeFunction(accessor => {
+								return accessor.get(IDiagnosticsService).printDiagnostics(info).then(() => Promise.reject(new ExpectedError()));
+							});
 						});
 					}
 
 					// Log uploader
 					if (typeof environmentService.args['upload-logs'] !== 'undefined') {
-						return uploadLogs(service, accessor.get(IRequestService), environmentService)
-							.then(() => Promise.reject(new ExpectedError()));
+						return instantiationService.invokeFunction(accessor => {
+							return uploadLogs(service, accessor.get(IRequestService), environmentService)
+								.then(() => Promise.reject(new ExpectedError()));
+						});
 					}
 
 					logService.trace('Sending env to running instance...');
