Merge branch 'intersystems-community:master' into master

Author: isc-klu

.vscode/settings.json

@@ -4,4 +4,5 @@
     "editor.tabSize": 2,
     "editor.formatOnSave": true
   },
+  "js/ts.tsdk.path": "node_modules/typescript/lib",
 }

package-lock.json

@@ -239,6 +239,10 @@
           "command": "vscode-objectscript.loadStudioColors",
           "when": "isWindows"
         },
+        {
+          "command": "vscode-objectscript.newFile.class",
+          "when": "false"
+        },
         {
           "command": "vscode-objectscript.newFile.businessOperation",
           "when": "false"
@@ -591,6 +595,11 @@
         }
       ],
       "file/newFile": [
+        {
+          "command": "vscode-objectscript.newFile.class",
+          "when": "workspaceFolderCount != 0",
+          "group": "file"
+        },
         {
           "command": "vscode-objectscript.newFile.kpi",
           "when": "workspaceFolderCount != 0",
@@ -1021,6 +1030,11 @@
         "command": "vscode-objectscript.loadStudioColors",
         "title": "Load Studio Syntax Colors"
       },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.newFile.class",
+        "title": "Class"
+      },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.newFile.kpi",

package.json

@@ -12,6 +12,7 @@ import {
   checkConnection,
   schemas,
   checkingConnection,
+  inactiveServerIds,
 } from "../extension";
 import { currentWorkspaceFolder, outputChannel, outputConsole } from "../utils";
 
@@ -232,7 +233,7 @@ export class AtelierAPI {
       } = getResolvedConnectionSpec(serverName, config("intersystems.servers", workspaceFolderName).get(serverName));
       this._config = {
         serverName,
-        active: this.externalServer || conn.active,
+        active: !inactiveServerIds.has(serverName),
         apiVersion: workspaceState.get(this.configName.toLowerCase() + ":apiVersion", DEFAULT_API_VERSION),
         serverVersion: workspaceState.get(this.configName.toLowerCase() + ":serverVersion", DEFAULT_SERVER_VERSION),
         https: scheme === "https",
@@ -245,13 +246,6 @@ export class AtelierAPI {
         pathPrefix,
         docker: false,
       };
-
-      // Report server as inactive when no namespace has been determined,
-      // otherwise output channel reports the issue.
-      // This arises when a server-only workspace is editing the user's settings.json, or the .code-workspace file.
-      if (this._config.ns === "" && this.externalServer) {
-        this._config.active = false;
-      }
     } else if (conn["docker-compose"]) {
       // Provided a docker-compose type connection spec has previously been resolved we can use its values
       const resolvedSpec = getResolvedConnectionSpec(workspaceFolderName, undefined);

src/api/index.ts

@@ -6,6 +6,7 @@ import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import { replaceFile, getWsFolder, handleError, displayableUri } from "../utils";
 import { getFileName } from "./export";
 import { getUrisForDocument } from "../utils/documentIndex";
+import { pickDocument } from "../utils/documentPicker";
 
 interface InputStepItem extends vscode.QuickPickItem {
   value?: string;
@@ -25,7 +26,13 @@ interface QuickPickStepOptions {
   items: InputStepItem[];
 }
 
-type InputStepOptions = InputBoxStepOptions | QuickPickStepOptions;
+interface ClassPickStepOptions {
+  type: "classPick";
+  title: string;
+  api: AtelierAPI | undefined;
+}
+
+type InputStepOptions = InputBoxStepOptions | QuickPickStepOptions | ClassPickStepOptions;
 
 /**
  * Get input from the user using multiple steps.
@@ -101,6 +108,63 @@ async function multiStepInput(steps: InputStepOptions[]): Promise<string[] | und
         });
         inputBox.show();
       });
+    } else if (stepOptions.type == "classPick") {
+      // Optional step: escape = skip (store ""), back = go back one step, pick = store class name
+      let picked: string | undefined;
+      if (stepOptions.api) {
+        picked = await pickDocument(stepOptions.api, stepOptions.title, "cls", step + 1, steps.length);
+      } else {
+        // Fallback InputBox when there's no server connection
+        picked = await new Promise<string | undefined>((resolve) => {
+          let settled = false;
+          const settle = (v: string | undefined) => {
+            if (!settled) {
+              settled = true;
+              resolve(v);
+            }
+          };
+          const inputBox = vscode.window.createInputBox();
+          inputBox.ignoreFocusOut = true;
+          inputBox.step = step + 1;
+          inputBox.totalSteps = steps.length;
+          inputBox.buttons = step > 0 ? [vscode.QuickInputButtons.Back] : [];
+          inputBox.title = stepOptions.title;
+          inputBox.placeholder = "Package.Subpackage.Class";
+          inputBox.onDidTriggerButton(() => {
+            settle(undefined); // Back was pressed
+            inputBox.hide();
+          });
+          inputBox.onDidAccept(() => {
+            if (typeof inputBox.validationMessage != "string") {
+              settle(inputBox.value); // "" = skip, or a valid class name
+              inputBox.hide();
+            }
+          });
+          inputBox.onDidHide(() => {
+            settle(""); // Escape = skip this optional step
+            inputBox.dispose();
+          });
+          inputBox.onDidChangeValue((value) => {
+            inputBox.validationMessage = value ? validateClassName(value) : undefined;
+          });
+          inputBox.show();
+        });
+      }
+      if (picked === "") {
+        // Back button was pressed: go back one step
+        step--;
+      } else {
+        // undefined = skipped, or a class name was entered/picked
+        if (typeof picked == "undefined") {
+          picked = "";
+        } else if (picked.slice(-4) == ".cls") {
+          picked = picked.slice(0, -4);
+        }
+        results[step] = picked;
+        step++;
+      }
+      // This is an optional step; never cancel the wizard on escape
+      escape = false;
     } else {
       // Show the QuickPick
       escape = await new Promise<boolean>((resolve) => {
@@ -222,6 +286,7 @@ function getAdapterPrompt(adapters: InputStepItem[], type: AdapaterClassType): I
 
 /** The types of classes we can create */
 export enum NewFileType {
+  Class = "Class",
   BusinessOperation = "Business Operation",
   BusinessService = "Business Service",
   BPL = "Business Process",
@@ -262,7 +327,7 @@ export async function newFile(type: NewFileType): Promise<void> {
       api = undefined;
     }
 
-    if (type != NewFileType.KPI) {
+    if (type != NewFileType.KPI && type != NewFileType.Class) {
       // Check if we're connected to an Interoperability namespace
       const ensemble: boolean = api
         ? await api.getNamespace().then((data) => data.result.content.features[0].enabled)
@@ -402,7 +467,7 @@ export async function newFile(type: NewFileType): Promise<void> {
     inputSteps.push(
       {
         type: "inputBox",
-        title: `Enter a name for the new ${type} class`,
+        title: `Enter a name for the new ${type == NewFileType.Class ? "class" : type + " class"}`,
         placeholder: "Package.Subpackage.Class",
         validateInput: (value: string) => {
           const valid = validateClassName(value);
@@ -933,6 +998,30 @@ Parameter RESPONSECLASSNAME As CLASSNAME = "${respClass}";`
 /// InterSystems IRIS purges message bodies based on the class when the option to purge message bodies is enabled
 Parameter ENSPURGE As BOOLEAN = 1;
 
+}
+`;
+    } else if (type == NewFileType.Class) {
+      // Add the superclass picker as the third step
+      inputSteps.push({
+        type: "classPick",
+        title: "Pick an optional superclass or press 'Escape' for none",
+        api: api,
+      });
+
+      // Prompt the user
+      const results = await multiStepInput(inputSteps);
+      if (!results) {
+        return;
+      }
+      cls = results[0];
+      const [, desc, superclass] = results;
+
+      // Generate the file's content
+      clsContent = `
+${typeof desc == "string" ? "/// " + desc.replace(/\n/g, "\n/// ") : ""}
+Class ${cls}${superclass ? ` Extends ${superclass}` : ""}
+{
+
 }
 `;
     }

src/commands/newFile.ts

@@ -338,6 +338,9 @@ export function getResolvedConnectionSpec(key: string, dflt: any): any {
   return dflt;
 }
 
+/** The `api.serverId`s of all servers that are known to be inactive */
+export const inactiveServerIds: Set<string> = new Set();
+
 export async function checkConnection(
   clearCookies = false,
   uri?: vscode.Uri,
@@ -432,9 +435,8 @@ export async function checkConnection(
     handleError(message);
     panel.text = `${PANEL_LABEL} $(error)`;
     panel.tooltip = `ERROR - ${message}`;
-    if (!api.externalServer) {
-      await setConnectionState(configName, false);
-    }
+    inactiveServerIds.add(api.serverId);
+    if (!api.externalServer) await setConnectionState(configName, false);
     return;
   }
   checkingConnection = true;
@@ -448,9 +450,8 @@ export async function checkConnection(
     } else {
       panel.tooltip = new vscode.MarkdownString(`Connected as \`${username}\``);
     }
-    if (!api.externalServer) {
-      await setConnectionState(configName, true);
-    }
+    inactiveServerIds.delete(api.serverId);
+    if (!api.externalServer) await setConnectionState(configName, true);
     return;
   };
 
@@ -503,7 +504,8 @@ export async function checkConnection(
                 });
             }
           } else {
-            await setConnectionState(configName, false);
+            inactiveServerIds.add(api.serverId);
+            if (!api.externalServer) await setConnectionState(configName, false);
           }
         } else {
           success = await new Promise<boolean>((resolve) => {
@@ -535,8 +537,9 @@ export async function checkConnection(
                         checkingConnection = false;
                       })
                   );
-                } else if (!api.externalServer) {
-                  await setConnectionState(configName, false);
+                } else {
+                  inactiveServerIds.add(api.serverId);
+                  if (!api.externalServer) await setConnectionState(configName, false);
                 }
                 resolve(false);
               });
@@ -554,7 +557,8 @@ export async function checkConnection(
       );
       panel.text = `${connInfo} $(error)`;
       panel.tooltip = `ERROR - ${message}`;
-      await setConnectionState(configName, false);
+      inactiveServerIds.add(api.serverId);
+      if (!api.externalServer) await setConnectionState(configName, false);
     })
     .finally(() => {
       checkingConnection = false;
@@ -1608,6 +1612,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       sendCommandTelemetryEvent("loadStudioColors");
       loadStudioColors(languageServerExt);
     }),
+    vscode.commands.registerCommand("vscode-objectscript.newFile.class", () => {
+      sendCommandTelemetryEvent("newFile.class");
+      newFile(NewFileType.Class);
+    }),
     vscode.commands.registerCommand("vscode-objectscript.newFile.businessOperation", () => {
       sendCommandTelemetryEvent("newFile.businessOperation");
       newFile(NewFileType.BusinessOperation);