various fixes

Author: gjsjohnmurray

package.json

@@ -74,7 +74,7 @@
     "viewsWelcome": [
       {
         "view": "explorer",
-        "contents": "You can also create a new workspace that edits or views code directly on an [InterSystems server](https://intersystems-community.github.io/vscode-objectscript/serverside/).\n[Choose Server and Namespace](command:vscode-objectscript.addServerNamespaceToWorkspace)"
+        "contents": "You can also create a new workspace to edit or view code directly on an [InterSystems server](https://intersystems-community.github.io/vscode-objectscript/serverside/).\n[Choose Server and Namespace](command:vscode-objectscript.addServerNamespaceToWorkspace)"
       }
     ],
     "menus": {

src/commands/addServerNamespaceToWorkspace.ts

@@ -10,18 +10,26 @@ export async function addServerNamespaceToWorkspace(): Promise<void> {
     return;
   }
   // Get user's choice of server
-  const options: vscode.QuickPickOptions = { ignoreFocusOut: true };
+  const options: vscode.QuickPickOptions = {};
   const serverName: string = await serverManagerApi.pickServer(undefined, options);
   if (!serverName) {
     return;
   }
   // Get its namespace list
   let uri = vscode.Uri.parse(`isfs://${serverName}/?ns=%SYS`);
   const api = new AtelierAPI(uri);
-  const allNamespaces: string[] = await api.serverInfo().then((data) => data.result.content.namespaces);
+  const allNamespaces: string[] = await api
+    .serverInfo()
+    .then((data) => data.result.content.namespaces)
+    .catch(() => []);
   // Prepare a displayable form of its connection spec as a hint to the user
   const connSpec = await serverManagerApi.getServerSpec(serverName);
   const connDisplayString = `${connSpec.webServer.scheme}://${connSpec.webServer.host}:${connSpec.webServer.port}/${connSpec.webServer.pathPrefix}`;
+  // Handle serveInfo having failed or returned no namespaces
+  if (!allNamespaces.length) {
+    vscode.window.showErrorMessage(`No namespace list returned by server at ${connDisplayString}`);
+    return;
+  }
   // Get user's choice of namespace
   const namespace = await vscode.window.showQuickPick(allNamespaces, {
     placeHolder: `Namespace on server '${serverName}' (${connDisplayString})`,

src/extension.ts

@@ -101,7 +101,7 @@ const aiKey = packageJson.aiKey;
 export const config = (setting?: string, workspaceFolderName?: string): vscode.WorkspaceConfiguration | any => {
   workspaceFolderName = workspaceFolderName || currentWorkspaceFolder();
   if (
-    vscode.workspace.workspaceFolders &&
+    vscode.workspace.workspaceFolders?.length &&
     workspaceFolderName &&
     workspaceFolderName !== "" &&
     vscode.workspace.getConfiguration("intersystems.servers", null).has(workspaceFolderName)