SSH Target Selector

Extension/package.nls.json

@@ -239,7 +239,7 @@
     "c_cpp.configuration.legacyCompilerArgsBehavior.markdownDescription": "Enable pre-v1.10.0 behavior for how shell escaping is handled in compiler arg settings. Shell escaping is no longer expected or supported by default in arg arrays starting in v1.10.0.",
     "c_cpp.configuration.legacyCompilerArgsBehavior.deprecationMessage": "This setting is temporary to support transitioning to corrected behavior in v1.10.0.",
     "c_cpp.contributes.views.cppReferencesView.title": "C/C++: Other references results",
-    "c_cpp.contributes.views.SshTargetsView.title": "C/C++: SSH targets",
+    "c_cpp.contributes.views.SshTargetsView.title": { "message": "CppTools: SSH targets", "comment": [ "Do not localize `CppTools`." ]  },
     "c_cpp.contributes.viewsWelcome.contents": { "message": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).", "comment": [ "Markdown text between () should not be altered: https://en.wikipedia.org/wiki/Markdown" ] },
     "c_cpp.configuration.debugShortcut.description": "Show the \"Run and Debug\" play button and \"Add Debug Configuration\" gear in the editor title bar for C++ files.",
     "c_cpp.debuggers.pipeTransport.description": "When present, this tells the debugger to connect to a remote computer using another executable as a pipe that will relay standard input/output between VS Code and the MI-enabled debugger backend executable (such as gdb).",

Extension/src/SSH/TargetsView/targetNodes.ts

@@ -7,6 +7,10 @@ import { extensionContext, ISshConfigHostInfo, pathAccessible } from "../../comm
 import { TreeItem } from "vscode";
 import { LabelLeafNode } from "./common";
 import { constants } from 'fs';
+import * as nls from 'vscode-nls';
+
+nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
+const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
 export const workspaceState_activeSshTarget: string = 'workspaceState_activeSshTarget';
 
@@ -32,7 +36,7 @@ export class TargetLeafNode extends LabelLeafNode {
         const item: TreeItem = await super.getTreeItem();
         const removable: boolean = await isWritable(this.sshConfigHostInfo.file);
         if (_activeTarget === this.name) {
-            item.label = `* ${item.label}`;
+            item.label = localize('ssh.target.active.label', '{0} [Active]', this.getLabel());
             if (removable) {
                 item.contextValue = 'CppSshTargetsView.targetLeafRemovable';
             }

Extension/src/SSH/commandInteractors.ts

@@ -5,6 +5,11 @@
 
 import * as vscode from 'vscode';
 import { stripEscapeSequences, isWindows, escapeStringForRegex, ISshHostInfo, getFullHostAddress, extensionContext } from '../common';
+import { getOutputChannelLogger } from '../logger';
+import * as nls from 'vscode-nls';
+
+nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
+const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
 /**
  * The users that we autofilled their passwords.
@@ -326,6 +331,25 @@ export class ContinueOnInteractor implements IInteractor {
     }
 }
 
+export class ConnectionFailureInteractor implements IInteractor {
+    static ID = 'connectionFailure';
+
+    constructor(private readonly hostName: string) { }
+
+    get id(): string {
+        return ConnectionFailureInteractor.ID;
+    }
+
+    async onData(data: string): Promise<IInteraction> {
+        const result: IInteraction = { postAction: 'keep' };
+        if (data.includes('Connection refused') || data.includes('Could not resolve hostname')) {
+            result.postAction = 'consume';
+            getOutputChannelLogger().showErrorMessage(localize('failed.to.connect', 'Failed to connect to {0}', this.hostName));
+        }
+        return result;
+    }
+}
+
 export class ComposedInteractor implements IInteractor {
     constructor(private readonly interactors: IInteractor[]) { }
 

Extension/src/SSH/sshCommandRunner.ts

@@ -19,7 +19,8 @@ import {
     ContinueOnInteractor,
     ISystemInteractor,
     IInteraction,
-    autoFilledPasswordForUsers
+    autoFilledPasswordForUsers,
+    ConnectionFailureInteractor
 } from './commandInteractors';
 import { isWindows, ISshHostInfo, splitLines, stripEscapeSequences, ProcessReturnType } from '../common';
 import { getOutputChannelLogger } from '../logger';
@@ -203,7 +204,8 @@ export async function runSshTerminalCommandWithLogin(
             new DifferingHostKeyInteractor(showDifferingHostConfirmation),
             new PasswordInteractor(host, showPasswordInputBox),
             new TwoFacInteractor(showVerificationCodeInputBox),
-            new DuoTwoFacInteractor(showVerificationCodeInputBox)
+            new DuoTwoFacInteractor(showVerificationCodeInputBox),
+            new ConnectionFailureInteractor(host.hostName)
         );
     }