Only wait for rich client to reconnect

alexdima · alexdima · commit 39193a5fde91 · 2019-05-24T23:26:52.000+02:00
diff --git a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
@@ -131,13 +131,21 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 						protocol.onClose(() => onTerminate());
 						resolve(protocol);
 
-						protocol.onSocketClose(() => {
-							// The socket has closed, let's give the renderer a certain amount of time to reconnect
-							disconnectWaitTimer = setTimeout(() => {
-								disconnectWaitTimer = null;
+						if (msg.skipWebSocketFrames) {
+							// Wait for rich client to reconnect
+							protocol.onSocketClose(() => {
+								// The socket has closed, let's give the renderer a certain amount of time to reconnect
+								disconnectWaitTimer = setTimeout(() => {
+									disconnectWaitTimer = null;
+									onTerminate();
+								}, ProtocolConstants.ReconnectionGraceTime);
+							});
+						} else {
+							// Do not wait for web companion to reconnect
+							protocol.onSocketClose(() => {
 								onTerminate();
-							}, ProtocolConstants.ReconnectionGraceTime);
-						});
+							});
+						}
 					}
 				}
 			});
