Integrate classPick into multiStepInput via ClassPickStepOptions

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

Author: Copilot

src/commands/newFile.ts

@@ -26,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.
@@ -102,6 +108,58 @@ 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 pickClass(stepOptions.api, stepOptions.title, step > 0);
+      } 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 === undefined) {
+        // Back button was pressed: go back one step
+        step--;
+      } else {
+        // "" = skipped, or a class name was entered/picked
+        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) => {
@@ -938,26 +996,20 @@ Parameter ENSPURGE As BOOLEAN = 1;
 }
 `;
     } else if (type == NewFileType.Class) {
-      // Prompt the user for the class name and description
+      // Add the superclass picker as the third step
+      inputSteps.push({
+        type: "classPick",
+        title: "Pick an optional superclass. Press 'Escape' to skip.",
+        api: api,
+      });
+
+      // Prompt the user
       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),
-        });
-      }
+      const [, desc, superclass] = results;
 
       // Generate the file's content
       clsContent = `

src/commands/project.ts

@@ -653,20 +653,32 @@ 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.
+ * - Returns the class name (without the `.cls` extension) when a class is picked.
+ * - Returns `""` when the user presses Escape (skip this optional step).
+ * - Returns `undefined` when the user presses the Back button (only when `canGoBack` is `true`).
  */
-export async function pickClass(api: AtelierAPI, title: string): Promise<string | undefined> {
+export async function pickClass(api: AtelierAPI, title: string, canGoBack = false): 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) => {
+    // Use a settled flag so that onDidHide (which always fires) never double-resolves.
+    let settled = false;
+    const settle = (value: string | undefined) => {
+      if (!settled) {
+        settled = true;
+        resolve(value);
+      }
+    };
+
     const quickPick = vscode.window.createQuickPick<PickAdditionsItem>();
     quickPick.title = title;
     quickPick.ignoreFocusOut = true;
     quickPick.keepScrollPosition = true;
     quickPick.matchOnDescription = true;
     quickPick.buttons = [
+      ...(canGoBack ? [vscode.QuickInputButtons.Back] : []),
       {
         iconPath: new vscode.ThemeIcon("library"),
         tooltip: "System",
@@ -721,13 +733,18 @@ export async function pickClass(api: AtelierAPI, title: string): Promise<string
     };
 
     quickPick.onDidTriggerButton((button) => {
-      quickPick.busy = true;
-      if (button.tooltip == "System") {
-        sys = button.toggle.checked ? "1" : "0";
+      if (button === vscode.QuickInputButtons.Back) {
+        settle(undefined); // signal "go back" to the caller
+        quickPick.hide();
       } else {
-        gen = button.toggle.checked ? "1" : "0";
+        quickPick.busy = true;
+        if (button.tooltip == "System") {
+          sys = button.toggle.checked ? "1" : "0";
+        } else {
+          gen = button.toggle.checked ? "1" : "0";
+        }
+        getRootItems();
       }
-      getRootItems();
     });
 
     quickPick.onDidTriggerItemButton((event) => {
@@ -771,13 +788,13 @@ export async function pickClass(api: AtelierAPI, title: string): Promise<string
       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);
+        settle(name);
         quickPick.hide();
       }
     });
 
     quickPick.onDidHide(() => {
-      resolve(undefined);
+      settle(""); // Escape pressed: resolve with "" to signal "skip this optional step"
       quickPick.dispose();
     });