debt - restore previous async behaviour on startup

src/vs/code/electron-main/main.ts

@@ -38,6 +38,7 @@ import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { uploadLogs } from 'vs/code/electron-main/logUploader';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
+import { Client } from 'vs/base/parts/ipc/common/ipc.net';
 
 class ExpectedError extends Error {
 	readonly isExpected = true;
@@ -63,6 +64,10 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 	}
 
 	async function setup(retry: boolean): Promise<Server> {
+
+		// Try to setup a server for running. If that succeeds it means
+		// we are the first instance to startup. Otherwise it is likely
+		// that another instance is already running.
 		let server: Server;
 		try {
 			server = await serve(environmentService.mainIPCHandle);
@@ -85,73 +90,12 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 			}
 
 			// there's a running instance, let's connect to it
+			let client: Client<string>;
 			try {
-				const client = await connect(environmentService.mainIPCHandle, 'main');
-
-				// Tests from CLI require to be the only instance currently
-				if (environmentService.extensionTestsLocationURI && !environmentService.debugExtensionHost.break) {
-					const msg = 'Running extension tests from the command line is currently only supported if no other instance of Code is running.';
-					logService.error(msg);
-					client.dispose();
-
-					throw new Error(msg);
-				}
-
-				// Show a warning dialog after some timeout if it takes long to talk to the other instance
-				// Skip this if we are running with --wait where it is expected that we wait for a while.
-				// Also skip when gathering diagnostics (--status) which can take a longer time.
-				let startupWarningDialogHandle: NodeJS.Timeout | undefined = undefined;
-				if (!environmentService.wait && !environmentService.status && !environmentService.args['upload-logs']) {
-					startupWarningDialogHandle = setTimeout(() => {
-						showStartupWarningDialog(
-							localize('secondInstanceNoResponse', "Another instance of {0} is running but not responding", product.nameShort),
-							localize('secondInstanceNoResponseDetail', "Please close all other instances and try again.")
-						);
-					}, 10000);
-				}
-
-				const channel = client.getChannel('launch');
-				const service = new LaunchChannelClient(channel);
-
-				// Process Info
-				if (environmentService.args.status) {
-					return instantiationService.invokeFunction(async accessor => {
-						const diagnostics = await accessor.get(IDiagnosticsService).getDiagnostics(service);
-
-						console.log(diagnostics);
-						throw new ExpectedError();
-					});
-				}
-
-				// Log uploader
-				if (typeof environmentService.args['upload-logs'] !== 'undefined') {
-					return instantiationService.invokeFunction(async accessor => {
-						await uploadLogs(service, accessor.get(IRequestService), environmentService);
-
-						throw new ExpectedError();
-					});
-				}
-
-
-				// Windows: allow to set foreground
-				if (platform.isWindows) {
-					await windowsAllowSetForegroundWindow(service);
-				}
-
-				// Send environment over...
-				logService.trace('Sending env to running instance...');
-				await service.start(environmentService.args, process.env as platform.IProcessEnvironment);
-
-				// Cleanup
-				await client.dispose();
-
-				// Now that we started, make sure the warning dialog is prevented
-				if (startupWarningDialogHandle) {
-					clearTimeout(startupWarningDialogHandle);
-				}
-
-				throw new ExpectedError('Sent env to running instance. Terminating...');
+				client = await connect(environmentService.mainIPCHandle, 'main');
 			} catch (error) {
+
+				// Handle unexpected connection errors by showing a dialog to the user
 				if (!retry || platform.isWindows || error.code !== 'ECONNREFUSED') {
 					if (error.code === 'EPERM') {
 						showStartupWarningDialog(
@@ -164,8 +108,8 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 				}
 
 				// it happens on Linux and OS X that the pipe is left behind
-				// let's delete it, since we can't connect to it
-				// and then retry the whole thing
+				// let's delete it, since we can't connect to it and then
+				// retry the whole thing
 				try {
 					fs.unlinkSync(environmentService.mainIPCHandle);
 				} catch (error) {
@@ -175,6 +119,70 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
 
 				return setup(false);
 			}
+
+			// Tests from CLI require to be the only instance currently
+			if (environmentService.extensionTestsLocationURI && !environmentService.debugExtensionHost.break) {
+				const msg = 'Running extension tests from the command line is currently only supported if no other instance of Code is running.';
+				logService.error(msg);
+				client.dispose();
+
+				throw new Error(msg);
+			}
+
+			// Show a warning dialog after some timeout if it takes long to talk to the other instance
+			// Skip this if we are running with --wait where it is expected that we wait for a while.
+			// Also skip when gathering diagnostics (--status) which can take a longer time.
+			let startupWarningDialogHandle: NodeJS.Timeout | undefined = undefined;
+			if (!environmentService.wait && !environmentService.status && !environmentService.args['upload-logs']) {
+				startupWarningDialogHandle = setTimeout(() => {
+					showStartupWarningDialog(
+						localize('secondInstanceNoResponse', "Another instance of {0} is running but not responding", product.nameShort),
+						localize('secondInstanceNoResponseDetail', "Please close all other instances and try again.")
+					);
+				}, 10000);
+			}
+
+			const channel = client.getChannel('launch');
+			const service = new LaunchChannelClient(channel);
+
+			// Process Info
+			if (environmentService.args.status) {
+				return instantiationService.invokeFunction(async accessor => {
+					const diagnostics = await accessor.get(IDiagnosticsService).getDiagnostics(service);
+
+					console.log(diagnostics);
+					throw new ExpectedError();
+				});
+			}
+
+			// Log uploader
+			if (typeof environmentService.args['upload-logs'] !== 'undefined') {
+				return instantiationService.invokeFunction(async accessor => {
+					await uploadLogs(service, accessor.get(IRequestService), environmentService);
+
+					throw new ExpectedError();
+				});
+			}
+
+
+			// Windows: allow to set foreground
+			if (platform.isWindows) {
+				await windowsAllowSetForegroundWindow(service);
+			}
+
+			// Send environment over...
+			logService.trace('Sending env to running instance...');
+			await service.start(environmentService.args, process.env as platform.IProcessEnvironment);
+
+			// Cleanup
+			await client.dispose();
+
+			// Now that we started, make sure the warning dialog is prevented
+			if (startupWarningDialogHandle) {
+				clearTimeout(startupWarningDialogHandle);
+			}
+
+			throw new ExpectedError('Sent env to running instance. Terminating...');
 		}
 
 		// Print --status usage info