Add optional superclass prompt (step 3) to new Class wizard

Co-authored-by: gjsjohnmurray <6726799+gjsjohnmurray@users.noreply.github.com>

Author: Copilot

src/commands/newFile.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 { pickClass } from "./project";
 
 interface InputStepItem extends vscode.QuickPickItem {
   value?: string;
@@ -937,18 +938,31 @@ Parameter ENSPURGE As BOOLEAN = 1;
 }
 `;
     } else if (type == NewFileType.Class) {
-      // Prompt the user
+      // Prompt the user for the class name and description
       const results = await multiStepInput(inputSteps);
       if (!results) {
         return;
       }
       cls = results[0];
       const [, desc] = results;
 
+      // Prompt for an optional superclass
+      let superclass: string | undefined;
+      if (api) {
+        superclass = await pickClass(api, "Pick an optional superclass. Press 'Escape' to skip.");
+      } else {
+        superclass = await vscode.window.showInputBox({
+          title: "Enter an optional superclass. Press 'Escape' to skip.",
+          ignoreFocusOut: true,
+          placeHolder: "Package.Subpackage.Class",
+          validateInput: (value: string) => (value ? validateClassName(value) : undefined),
+        });
+      }
+
       // Generate the file's content
       clsContent = `
 ${typeof desc == "string" ? "/// " + desc.replace(/\n/g, "\n/// ") : ""}
-Class ${cls}
+Class ${cls}${superclass ? ` Extends ${superclass}` : ""}
 {
 
 }

src/commands/project.ts

@@ -650,6 +650,143 @@ async function pickAdditions(
   });
 }
 
+/**
+ * Show an expandable QuickPick to let the user pick a single class from the server.
+ * Packages can be expanded to reveal their classes. Only leaf class items can be accepted.
+ * Returns the class name (without the `.cls` extension), or `undefined` if the user escapes.
+ */
+export async function pickClass(api: AtelierAPI, title: string): Promise<string | undefined> {
+  const query = "SELECT Name, Type FROM %Library.RoutineMgr_StudioOpenDialog(?,1,1,?,0,0,?)";
+  let sys: "0" | "1" = "0";
+  let gen: "0" | "1" = "0";
+
+  return new Promise<string | undefined>((resolve) => {
+    const quickPick = vscode.window.createQuickPick<PickAdditionsItem>();
+    quickPick.title = title;
+    quickPick.ignoreFocusOut = true;
+    quickPick.keepScrollPosition = true;
+    quickPick.matchOnDescription = true;
+    quickPick.buttons = [
+      {
+        iconPath: new vscode.ThemeIcon("library"),
+        tooltip: "System",
+        location: vscode.QuickInputButtonLocation.Input,
+        toggle: { checked: false },
+      },
+      {
+        iconPath: new vscode.ThemeIcon("server-process"),
+        tooltip: "Generated",
+        location: vscode.QuickInputButtonLocation.Input,
+        toggle: { checked: false },
+      },
+    ];
+
+    const getRootItems = (): Promise<void> => {
+      return api
+        .actionQuery(query, ["*.cls", sys, gen])
+        .then((data) => {
+          quickPick.items = data.result.content.map((i) => sodItemToPickAdditionsItem(i));
+          quickPick.busy = false;
+        })
+        .catch((error) => {
+          quickPick.hide();
+          handleError(error, "Failed to get namespace contents.");
+        });
+    };
+
+    const expandItem = (itemIdx: number): Promise<void> => {
+      const item = quickPick.items[itemIdx];
+      // Switch the expand button to a collapse button
+      const newItems = [...quickPick.items];
+      newItems[itemIdx] = {
+        ...item,
+        buttons: [{ iconPath: new vscode.ThemeIcon("chevron-down"), tooltip: "Collapse" }],
+      };
+      quickPick.items = newItems;
+      return api
+        .actionQuery(query, [item.fullName + "/*.cls", sys, gen])
+        .then((data) => {
+          const insertItems: PickAdditionsItem[] = data.result.content.map((i) =>
+            sodItemToPickAdditionsItem(i, item.fullName, item.label.search(/\S/))
+          );
+          const updatedItems = [...quickPick.items];
+          updatedItems.splice(itemIdx + 1, 0, ...insertItems);
+          quickPick.items = updatedItems;
+          quickPick.busy = false;
+        })
+        .catch((error) => {
+          quickPick.hide();
+          handleError(error, "Failed to get namespace contents.");
+        });
+    };
+
+    quickPick.onDidTriggerButton((button) => {
+      quickPick.busy = true;
+      if (button.tooltip == "System") {
+        sys = button.toggle.checked ? "1" : "0";
+      } else {
+        gen = button.toggle.checked ? "1" : "0";
+      }
+      getRootItems();
+    });
+
+    quickPick.onDidTriggerItemButton((event) => {
+      quickPick.busy = true;
+      const itemIdx = quickPick.items.findIndex((i) => i.fullName === event.item.fullName);
+      if (event.button.tooltip.charAt(0) == "E") {
+        expandItem(itemIdx);
+      } else {
+        // Collapse: remove the button and all descendants
+        const newItems = [...quickPick.items];
+        newItems[itemIdx] = {
+          ...newItems[itemIdx],
+          buttons: [{ iconPath: new vscode.ThemeIcon("chevron-right"), tooltip: "Expand" }],
+        };
+        quickPick.items = newItems.filter(
+          (i, idx) => idx <= itemIdx || !i.fullName.startsWith(event.item.fullName + ".")
+        );
+        quickPick.busy = false;
+      }
+    });
+
+    quickPick.onDidChangeValue((filter: string) => {
+      // Auto-expand a package when the user types its name followed by a dot
+      if (filter.endsWith(".")) {
+        const itemIdx = quickPick.items.findIndex(
+          (i) => i.fullName.toLowerCase() === filter.slice(0, -1).toLowerCase()
+        );
+        if (
+          itemIdx != -1 &&
+          quickPick.items[itemIdx].buttons?.length &&
+          quickPick.items[itemIdx].buttons[0].tooltip.charAt(0) == "E"
+        ) {
+          quickPick.busy = true;
+          expandItem(itemIdx);
+        }
+      }
+    });
+
+    quickPick.onDidAccept(() => {
+      const selected = quickPick.activeItems[0];
+      if (selected && !selected.buttons?.length) {
+        // Leaf class item (no expand button): strip the .cls extension and resolve
+        const name = selected.fullName.endsWith(".cls") ? selected.fullName.slice(0, -4) : selected.fullName;
+        resolve(name);
+        quickPick.hide();
+      }
+    });
+
+    quickPick.onDidHide(() => {
+      resolve(undefined);
+      quickPick.dispose();
+    });
+
+    quickPick.busy = true;
+    quickPick.show();
+    getRootItems();
+  });
+}
+
 export async function modifyProject(
   nodeOrUri: NodeBase | vscode.Uri | undefined,
   type: "add" | "remove"