Do not show "Cannot reconnect. Please reload the window" if the cause is a...

Do not show "Cannot reconnect. Please reload the window" if the cause is a handled RemoteAuthorityResolverError

src/vs/platform/remote/common/remoteAgentConnection.ts

@@ -287,7 +287,7 @@ export async function connectRemoteAgentManagement(options: IConnectionOptions,
 	} catch (err) {
 		options.logService.error(`[remote-connection] An error occurred in the very first connect attempt, it will be treated as a permanent error! Error:`);
 		options.logService.error(err);
-		PersistentConnection.triggerPermanentFailure();
+		PersistentConnection.triggerPermanentFailure(RemoteAuthorityResolverError.isHandled(err));
 		throw err;
 	}
 }
@@ -301,7 +301,7 @@ export async function connectRemoteAgentExtensionHost(options: IConnectionOption
 	} catch (err) {
 		options.logService.error(`[remote-connection] An error occurred in the very first connect attempt, it will be treated as a permanent error! Error:`);
 		options.logService.error(err);
-		PersistentConnection.triggerPermanentFailure();
+		PersistentConnection.triggerPermanentFailure(RemoteAuthorityResolverError.isHandled(err));
 		throw err;
 	}
 }
@@ -360,16 +360,21 @@ export class ConnectionGainEvent {
 }
 export class ReconnectionPermanentFailureEvent {
 	public readonly type = PersistentConnectionEventType.ReconnectionPermanentFailure;
+	constructor(
+		public readonly handled: boolean
+	) { }
 }
 export type PersistentConnectionEvent = ConnectionGainEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent;
 
 abstract class PersistentConnection extends Disposable {
 
-	public static triggerPermanentFailure(): void {
+	public static triggerPermanentFailure(handled: boolean): void {
 		this._permanentFailure = true;
-		this._instances.forEach(instance => instance._gotoPermanentFailure());
+		this._permanentFailureHandled = handled;
+		this._instances.forEach(instance => instance._gotoPermanentFailure(handled));
 	}
 	private static _permanentFailure: boolean = false;
+	private static _permanentFailureHandled: boolean = false;
 	private static _instances: PersistentConnection[] = [];
 
 	private readonly _onDidStateChange = this._register(new Emitter<PersistentConnectionEvent>());
@@ -396,7 +401,7 @@ abstract class PersistentConnection extends Disposable {
 		PersistentConnection._instances.push(this);
 
 		if (PersistentConnection._permanentFailure) {
-			this._gotoPermanentFailure();
+			this._gotoPermanentFailure(PersistentConnection._permanentFailureHandled);
 		}
 	}
 
@@ -455,13 +460,13 @@ abstract class PersistentConnection extends Disposable {
 				if (err.code === 'VSCODE_CONNECTION_ERROR') {
 					this._options.logService.error(`${logPrefix} A permanent error occurred in the reconnecting loop! Will give up now! Error:`);
 					this._options.logService.error(err);
-					PersistentConnection.triggerPermanentFailure();
+					PersistentConnection.triggerPermanentFailure(false);
 					break;
 				}
 				if (Date.now() - disconnectStartTime > ProtocolConstants.ReconnectionGraceTime) {
 					this._options.logService.error(`${logPrefix} An error occurred while reconnecting, but it will be treated as a permanent error because the reconnection grace time has expired! Will give up now! Error:`);
 					this._options.logService.error(err);
-					PersistentConnection.triggerPermanentFailure();
+					PersistentConnection.triggerPermanentFailure(false);
 					break;
 				}
 				if (RemoteAuthorityResolverError.isTemporarilyNotAvailable(err)) {
@@ -482,16 +487,22 @@ abstract class PersistentConnection extends Disposable {
 					// try again!
 					continue;
 				}
+				if (err instanceof RemoteAuthorityResolverError) {
+					this._options.logService.error(`${logPrefix} A RemoteAuthorityResolverError occurred while trying to reconnect. Will give up now! Error:`);
+					this._options.logService.error(err);
+					PersistentConnection.triggerPermanentFailure(RemoteAuthorityResolverError.isHandled(err));
+					break;
+				}
 				this._options.logService.error(`${logPrefix} An unknown error occurred while trying to reconnect, since this is an unknown case, it will be treated as a permanent error! Will give up now! Error:`);
 				this._options.logService.error(err);
-				PersistentConnection.triggerPermanentFailure();
+				PersistentConnection.triggerPermanentFailure(false);
 				break;
 			}
 		} while (!PersistentConnection._permanentFailure);
 	}
 
-	private _gotoPermanentFailure(): void {
-		this._onDidStateChange.fire(new ReconnectionPermanentFailureEvent());
+	private _gotoPermanentFailure(handled: boolean): void {
+		this._onDidStateChange.fire(new ReconnectionPermanentFailureEvent(handled));
 		safeDisposeProtocolAndSocket(this.protocol);
 	}
 

src/vs/workbench/contrib/remote/browser/remote.ts

@@ -54,6 +54,7 @@ import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/e
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remoteIndicator';
 import * as icons from 'vs/workbench/contrib/remote/browser/remoteIcons';
+import { ILogService } from 'vs/platform/log/common/log';
 
 
 export interface HelpInformation {
@@ -709,7 +710,8 @@ class RemoteAgentConnectionStatusListener extends Disposable implements IWorkben
 		@IProgressService progressService: IProgressService,
 		@IDialogService dialogService: IDialogService,
 		@ICommandService commandService: ICommandService,
-		@IQuickInputService quickInputService: IQuickInputService
+		@IQuickInputService quickInputService: IQuickInputService,
+		@ILogService logService: ILogService
 	) {
 		super();
 		const connection = remoteAgentService.getConnection();
@@ -821,7 +823,10 @@ class RemoteAgentConnectionStatusListener extends Disposable implements IWorkben
 					case PersistentConnectionEventType.ReconnectionPermanentFailure:
 						hideProgress();
 
-						if (!this._reloadWindowShown) {
+						if (e.handled) {
+							logService.info(`Error handled: Not showing a notification for the error.`);
+							console.log(`Error handled: Not showing a notification for the error.`);
+						} else if (!this._reloadWindowShown) {
 							this._reloadWindowShown = true;
 							dialogService.show(Severity.Error, nls.localize('reconnectionPermanentFailure', "Cannot reconnect. Please reload the window."), [nls.localize('reloadWindow', "Reload Window"), nls.localize('cancel', "Cancel")], { cancelId: 1 }).then(result => {
 								// Reload the window