Merge branch 'master' into adopt-SM187v2

Author: gjsjohnmurray

package.json

@@ -297,7 +297,7 @@
         },
         {
           "command": "vscode-objectscript.modifyWsFolder",
-          "when": "vscode-objectscript.connectActive && workspaceFolderCount != 0"
+          "when": "workspaceFolderCount != 0"
         },
         {
           "command": "vscode-objectscript.openErrorLocation",
@@ -606,7 +606,7 @@
         },
         {
           "command": "vscode-objectscript.modifyWsFolder",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && explorerResourceIsRoot && !listMultiSelection",
+          "when": "(!resourceScheme || resourceScheme =~ /^isfs(-readonly)?$/) && explorerResourceIsRoot && !listMultiSelection",
           "group": "objectscript_modify@3"
         },
         {

src/commands/addServerNamespaceToWorkspace.ts

@@ -397,20 +397,20 @@ export async function modifyWsFolder(wsFolderUri?: vscode.Uri): Promise<void> {
     if (!wsFolder) {
       return;
     }
-    if (notIsfs(wsFolder.uri)) {
-      vscode.window.showErrorMessage(
-        `Workspace folder '${wsFolder.name}' does not have scheme 'isfs' or 'isfs-readonly'.`,
-        "Dismiss"
-      );
-      return;
-    }
   } else {
     // Find the workspace folder for this uri
     wsFolder = vscode.workspace.getWorkspaceFolder(wsFolderUri);
     if (!wsFolder) {
       return;
     }
   }
+  if (notIsfs(wsFolder.uri)) {
+    vscode.window.showErrorMessage(
+      `Workspace folder '${wsFolder.name}' does not have scheme 'isfs' or 'isfs-readonly'.`,
+      "Dismiss"
+    );
+    return;
+  }
 
   // Prompt the user to modify the uri
   const newUri = await modifyWsFolderUri(wsFolder.uri);

src/commands/webSocketTerminal.ts

@@ -5,6 +5,9 @@ import { AtelierAPI } from "../api";
 import { connectionTarget, currentFile, getWsServerConnection, handleError, notIsfs, outputChannel } from "../utils";
 import { config, iscIcon, resolveConnectionSpec } from "../extension";
 
+const NO_ELIGIBLE_CONNECTIONS =
+  "Lite Terminal requires an active server connection to InterSystems IRIS version 2023.2 or above.";
+
 const keys = {
   enter: "\r",
   backspace: "\x7f",
@@ -766,6 +769,9 @@ export async function launchWebSocketTerminal(targetUri?: vscode.Uri): Promise<v
   } else {
     // Determine the server connection to use
     targetUri = currentFile()?.uri ?? (await getWsServerConnection("2023.2.0"));
+    if (targetUri === undefined) {
+      vscode.window.showErrorMessage(NO_ELIGIBLE_CONNECTIONS);
+    }
     if (!targetUri) return;
   }
   const api = new AtelierAPI(targetUri);
@@ -791,10 +797,10 @@ export class WebSocketTerminalProfileProvider implements vscode.TerminalProfileP
       // Get the terminal configuration. Will throw if there's an error.
       const terminalOpts = terminalConfigForUri(new AtelierAPI(uri), uri, true);
       return new vscode.TerminalProfile(terminalOpts);
-    } else if (uri == undefined) {
-      throw new Error(
-        "Lite Terminal requires an active server connection to InterSystems IRIS version 2023.2 or above."
-      );
+    } else if (uri === undefined) {
+      throw new Error(NO_ELIGIBLE_CONNECTIONS);
+    } else {
+      throw new Error("No connection was chosen.");
     }
   }
 }