cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: conflicts in remote.ts

Browse Source 
Looks like they modified a few of the cases related to Reconnection.
This commit is contained in:
Joe Previte 2021-02-25 12:23:14 -07:00
parent 502323a9c8
commit ccf2fe2a2e
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/vscode/src/vs/workbench/contrib/remote/browser/remote.ts
View File

@ -833,25 +833,6 @@ class RemoteAgentConnectionStatusListener extends Disposable implements IWorkben
} }
switch (e.type) { switch (e.type) {
case PersistentConnectionEventType.ConnectionLost: case PersistentConnectionEventType.ConnectionLost:
<<<<<<< HEAD
break;
case PersistentConnectionEventType.ReconnectionWait:
const BACKGROUND_RECONNECT_THRESHOLD = 2;
// If the first reconnect fails, we show the popup.
// This corresponds to about 5s wait.
if (e.connectionAttempt < BACKGROUND_RECONNECT_THRESHOLD) {
break;
}
if (!visibleProgress) {
visibleProgress = showProgress(ProgressLocation.Dialog, [reconnectButton, reloadButton]);
}
visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
reconnectWaitEvent = e;
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reconnectButton, reloadButton]);
visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
=======
reconnectionToken = e.reconnectionToken; reconnectionToken = e.reconnectionToken;
lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData; lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
reconnectionAttempts = 0; reconnectionAttempts = 0;
@ -883,19 +864,9 @@ class RemoteAgentConnectionStatusListener extends Disposable implements IWorkben
visibleProgress = showProgress(null, [reconnectButton, reloadButton]); visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds); visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
} }
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
break; break;
case PersistentConnectionEventType.ReconnectionRunning: case PersistentConnectionEventType.ReconnectionRunning:
<<<<<<< HEAD
if (!visibleProgress) {
// Our background reconnection threshold hasn't been hit yet.
break;
}
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reloadButton]);
visibleProgress.report(nls.localize('reconnectionRunning', "Attempting to reconnect..."));
=======
reconnectionToken = e.reconnectionToken; reconnectionToken = e.reconnectionToken;
lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData; lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
reconnectionAttempts = e.attempt; reconnectionAttempts = e.attempt;
@ -922,7 +893,6 @@ class RemoteAgentConnectionStatusListener extends Disposable implements IWorkben
if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) { if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
visibleProgress = showProgress(null, [reloadButton]); visibleProgress = showProgress(null, [reloadButton]);
visibleProgress.report(nls.localize('reconnectionRunning', "Disconnected. Attempting to reconnect...")); visibleProgress.report(nls.localize('reconnectionRunning', "Disconnected. Attempting to reconnect..."));
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
// Register to listen for quick input is opened // Register to listen for quick input is opened
disposableListener = quickInputService.onShow(() => { disposableListener = quickInputService.onShow(() => {