From a192d5d935830f19cf4d8a42fe7dd434581eaddd Mon Sep 17 00:00:00 2001
From: Kelvin Schoofs <schoofs.kelvin@gmail.com>
Date: Tue, 9 Feb 2021 19:16:34 +0100
Subject: [PATCH] Improve commandConfigure + prefer getConfig over getConfigs

---
 src/connect.ts |  6 +++---
 src/manager.ts | 15 +++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index 88d6cfd..f9d6f08 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -3,7 +3,7 @@ import { Socket } from 'net';
 import { Client, ClientChannel, ConnectConfig, SFTPWrapper as SFTPWrapperReal } from 'ssh2';
 import { SFTPStream } from 'ssh2-streams';
 import * as vscode from 'vscode';
-import { getConfigs } from './config';
+import { getConfig } from './config';
 import type { FileSystemConfig } from './fileSystemConfig';
 import { censorConfig, Logging } from './logging';
 import { toPromise } from './toPromise';
@@ -150,7 +150,7 @@ export async function createSocket(config: FileSystemConfig): Promise<NodeJS.Rea
   logging.info(`Creating socket`);
   if (config.hop) {
     logging.debug(`\tHopping through ${config.hop}`);
-    const hop = getConfigs().find(c => c.name === config.hop);
+    const hop = getConfig(config.hop);
     if (!hop) throw new Error(`A SSH FS configuration with the name '${config.hop}' doesn't exist`);
     const ssh = await createSSH(hop);
     if (!ssh) {
@@ -222,7 +222,7 @@ export async function createSSH(config: FileSystemConfig, sock?: NodeJS.Readable
     });
     try {
       logging.info(`Creating SSH session over the opened socket`);
-      let debug = (_msg: string) => {};
+      let debug = (_msg: string) => { };
       if (config.debug) {
         const scope = Logging.scope(`ssh2(${config.name})`);
         debug = (msg: string) => scope.debug(msg);
diff --git a/src/manager.ts b/src/manager.ts
index 8325dd5..08a6ebb 100644
--- a/src/manager.ts
+++ b/src/manager.ts
@@ -2,7 +2,7 @@
 import * as path from 'path';
 import type { Client, ClientChannel } from 'ssh2';
 import * as vscode from 'vscode';
-import { getConfig, getConfigs, loadConfigsRaw } from './config';
+import { getConfig, loadConfigsRaw } from './config';
 import { Connection, ConnectionManager } from './connection';
 import type { FileSystemConfig } from './fileSystemConfig';
 import { Logging } from './logging';
@@ -63,7 +63,7 @@ export class Manager implements vscode.TaskProvider, vscode.TerminalLinkProvider
     if (existing) return existing;
     let con: Connection | undefined;
     return this.creatingFileSystems[name] ||= catchingPromise<SSHFileSystem>(async (resolve, reject) => {
-      config = config || getConfigs().find(c => c.name === name);
+      config ||= getConfig(name);
       if (!config) throw new Error(`Couldn't find a configuration with the name '${name}'`);
       const con = await this.connectionManager.createConnection(name, config);
       this.connectionManager.update(con, con => con.pendingUserCount++);
@@ -126,7 +126,7 @@ export class Manager implements vscode.TaskProvider, vscode.TerminalLinkProvider
         if (chosen === 'Retry') {
           this.createFileSystem(name).catch(() => { });
         } else if (chosen === 'Configure') {
-          this.commandConfigure(name);
+          this.commandConfigure(config || name);
         } else {
           this.commandDisconnect(name);
         }
@@ -298,13 +298,20 @@ export class Manager implements vscode.TaskProvider, vscode.TerminalLinkProvider
   public async commandConfigure(target: string | FileSystemConfig) {
     Logging.info(`Command received to configure ${typeof target === 'string' ? target : target.name}`);
     if (typeof target === 'object') {
+      if (!target._location && !target._locations.length) {
+        vscode.window.showErrorMessage('Cannot configure a config-less connection!');
+        return;
+      }
       this.openSettings({ config: target, type: 'editconfig' });
       return;
     }
     target = target.toLowerCase();
     let configs = await loadConfigsRaw();
     configs = configs.filter(c => c.name === target);
-    if (configs.length === 0) throw new Error('Unexpectedly found no matching configs?');
+    if (configs.length === 0) {
+      vscode.window.showErrorMessage(`Found no matching configs for '${target}'`);
+      return Logging.error(`Unexpectedly found no matching configs for '${target}' in commandConfigure?`);
+    }
     const config = configs.length === 1 ? configs[0] : configs;
     this.openSettings({ config, type: 'editconfig' });
   }