Remove some uses of ignoreFocusOut

Author: isc-bsaviano

src/commands/compile.ts

@@ -748,21 +748,23 @@ export async function importXMLFiles(): Promise<any> {
   try {
     // Use the server connection from a workspace folder
     const wsFolder = await getWsFolder(
-      "Pick a workspace folder. Server-side folders import from the local file system."
+      "Pick a workspace folder. Server-side folders import from the local file system.",
+      false,
+      false,
+      false,
+      true
     );
     if (!wsFolder) {
       if (wsFolder === undefined) {
         // Strict equality needed because undefined == null
-        vscode.window.showErrorMessage("'Import XML Files...' command requires an open workspace.", "Dismiss");
+        vscode.window.showErrorMessage(
+          "'Import XML Files...' command requires a workspace folder with an active server connection.",
+          "Dismiss"
+        );
       }
       return;
     }
     const api = new AtelierAPI(wsFolder.uri);
-    // Make sure the server connection is active
-    if (!api.active || api.ns == "") {
-      vscode.window.showErrorMessage("'Import XML Files...' command requires an active server connection.", "Dismiss");
-      return;
-    }
     // Make sure the server has the xml endpoints
     if (api.config.apiVersion < 7) {
       vscode.window.showErrorMessage(

src/commands/export.ts

@@ -292,26 +292,24 @@ export async function exportCurrentFile(): Promise<any> {
 export async function exportDocumentsToXMLFile(): Promise<void> {
   try {
     // Use the server connection from a workspace folder
-    const wsFolder = await getWsFolder("Pick a workspace folder. Server-side folders export to the local file system.");
+    const wsFolder = await getWsFolder(
+      "Pick a workspace folder. Server-side folders export to the local file system.",
+      false,
+      false,
+      false,
+      true
+    );
     if (!wsFolder) {
       if (wsFolder === undefined) {
         // Strict equality needed because undefined == null
         vscode.window.showErrorMessage(
-          "'Export Documents to XML File...' command requires an open workspace.",
+          "'Export Documents to XML File...' command requires a workspace folder with an active server connection.",
           "Dismiss"
         );
       }
       return;
     }
     const api = new AtelierAPI(wsFolder.uri);
-    // Make sure the server connection is active
-    if (!api.active || api.ns == "") {
-      vscode.window.showErrorMessage(
-        "'Export Documents to XML File...' command requires an active server connection.",
-        "Dismiss"
-      );
-      return;
-    }
     // Make sure the server has the xml endpoints
     if (api.config.apiVersion < 7) {
       vscode.window.showErrorMessage(

src/commands/jumpToTagAndOffset.ts

@@ -66,7 +66,6 @@ export async function openErrorLocation(): Promise<void> {
   const regex = /^(%?[\p{L}\d]+)?(?:\+(\d+))?\^(%?[\p{L}\d.]+)$/u;
   const location = await vscode.window.showInputBox({
     title: "Enter the location to open",
-    ignoreFocusOut: true,
     placeHolder: "label+offset^routine",
     validateInput: (v) => (regex.test(v.trim()) ? undefined : "Input is not in the format 'label+offset^routine'"),
   });

src/commands/project.ts

@@ -25,7 +25,6 @@ export async function pickProject(api: AtelierAPI): Promise<string | undefined>
     );
   if (projects.length === 0) {
     const create = await vscode.window.showQuickPick(["Yes", "No"], {
-      ignoreFocusOut: true,
       title: `Namespace ${ns} on server '${api.serverId}' contains no projects. Create one?`,
     });
     if (create == "Yes") {
@@ -38,7 +37,6 @@ export async function pickProject(api: AtelierAPI): Promise<string | undefined>
     let resolveOnHide = true;
     const quickPick = vscode.window.createQuickPick();
     quickPick.title = `Select a project in namespace ${ns} on server '${api.serverId}', or click '+' to add one.`;
-    quickPick.ignoreFocusOut = true;
     quickPick.items = projects;
     quickPick.buttons = [{ iconPath: new vscode.ThemeIcon("add"), tooltip: "Create new project" }];
 
@@ -837,7 +835,6 @@ export async function modifyProject(
             };
           }),
           {
-            ignoreFocusOut: true,
             canPickMany: true,
             title: `Pick the items to remove from project '${project}'.`,
           }

src/commands/serverActions.ts

@@ -103,7 +103,6 @@ export async function serverActions(): Promise<void> {
 
         const namespace = await vscode.window.showQuickPick(allNamespaces, {
           title: "Pick the namespace to switch to",
-          ignoreFocusOut: true,
         });
 
         if (namespace) {

src/commands/unitTest.ts

@@ -402,7 +402,6 @@ async function runHandler(
         }),
         {
           matchOnDetail: true,
-          ignoreFocusOut: true,
           title: `Cannot ${action} tests from multiple roots at once`,
           placeHolder: `Pick a root to ${action} tests from`,
         }

src/commands/xmlToUdl.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import path = require("path");
 import { config, OBJECTSCRIPTXML_FILE_SCHEMA, xmlContentProvider } from "../extension";
 import { AtelierAPI } from "../api";
-import { fileExists, handleError, notIsfs, outputChannel } from "../utils";
+import { fileExists, getWsFolder, handleError, notIsfs, outputChannel } from "../utils";
 import { getFileName } from "./export";
 
 const exportHeader = /^\s*<Export generator="(Cache|IRIS)" version="\d+"/;
@@ -33,7 +33,6 @@ export async function previewXMLAsUDL(textEditor: vscode.TextEditor, auto = fals
           }),
           {
             canPickMany: true,
-            ignoreFocusOut: true,
             title: "Select the documents to preview",
           }
         );
@@ -96,29 +95,17 @@ export async function extractXMLFileContents(xmlUri?: vscode.Uri): Promise<void>
     if (xmlUri) {
       wsFolder = vscode.workspace.getWorkspaceFolder(xmlUri);
     } else {
-      // Can only run this command on non-isfs folders with an active server connection
-      const options = vscode.workspace.workspaceFolders.filter((f) => notIsfs(f.uri) && new AtelierAPI(f.uri).active);
-      if (options.length == 0) {
-        vscode.window.showErrorMessage(
-          "'Extract Documents from XML File...' command requires a non-isfs workspace folder with an active server connection.",
-          "Dismiss"
-        );
+      // Use the server connection from a workspace folder
+      wsFolder = await getWsFolder("Pick the workspace folder to run the command in", false, false, true, true);
+      if (!wsFolder) {
+        if (wsFolder === undefined) {
+          // Strict equality needed because undefined == null
+          vscode.window.showErrorMessage(
+            "'Extract Documents from XML File...' command requires a non-isfs workspace folder with an active server connection.",
+            "Dismiss"
+          );
+        }
         return;
-      } else if (options.length == 1) {
-        wsFolder = options[0];
-      } else {
-        // Prompt the user to select a workspace folder
-        wsFolder = (
-          await vscode.window.showQuickPick(
-            options.map((f) => {
-              return { label: f.name, wf: f };
-            }),
-            {
-              ignoreFocusOut: true,
-              title: "Pick the workspace folder to run the command in",
-            }
-          )
-        )?.wf;
       }
     }
     if (!wsFolder) return;

src/extension.ts

@@ -1541,11 +1541,17 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     ),
     vscode.commands.registerCommand("vscode-objectscript.compileIsfs", (uri) => fileSystemProvider.compile(uri)),
     vscode.commands.registerCommand("vscode-objectscript.openISCDocument", async () => {
-      const wsFolder = await getWsFolder("Pick the workspace folder where you want to open a document");
+      const wsFolder = await getWsFolder(
+        "Pick the workspace folder where you want to open a document",
+        false,
+        false,
+        false,
+        true
+      );
       if (!wsFolder) {
         if (wsFolder === undefined) {
           // Strict equality needed because undefined == null
-          vscode.window.showErrorMessage("No workspace folders are open.", "Dismiss");
+          vscode.window.showErrorMessage("No workspace folders with an active server connection are open.", "Dismiss");
         }
         return;
       }

src/utils/index.ts

@@ -824,7 +824,6 @@ export async function getWsServerConnection(minVersion?: string): Promise<vscode
   return vscode.window
     .showQuickPick(conns, {
       canPickMany: false,
-      ignoreFocusOut: true,
       matchOnDescription: true,
       matchOnDetail: true,
       title: "Pick a server connection from the current workspace",
@@ -840,20 +839,26 @@ export async function getWsServerConnection(minVersion?: string): Promise<vscode
  * @param title An optional custom prompt title.
  * @param writableOnly If `true`, only allow the user to pick from writeable folders.
  * @param isfsOnly If `true`, only allow the user to pick from `isfs(-readonly)` folders.
+ * @param notIsfsOnly If `true`, only allow the user to pick from non-`isfs(-readonly)` folders.
+ * @param active If `true`, only allow the user to pick from folders with an active server connection.
  * @returns `undefined` if there were no workspace folders and `null` if the
  * user explicitly escaped from the QuickPick.
  */
 export async function getWsFolder(
   title = "",
   writeableOnly = false,
-  isfsOnly = false
+  isfsOnly = false,
+  notIsfsOnly = false,
+  active = false
 ): Promise<vscode.WorkspaceFolder | null | undefined> {
   if (!vscode.workspace.workspaceFolders?.length) return;
   // Apply the filters
   const folders = vscode.workspace.workspaceFolders.filter(
     (f) =>
       (!writeableOnly || (writeableOnly && vscode.workspace.fs.isWritableFileSystem(f.uri.scheme))) &&
-      (!isfsOnly || (isfsOnly && filesystemSchemas.includes(f.uri.scheme)))
+      (!isfsOnly || (isfsOnly && filesystemSchemas.includes(f.uri.scheme))) &&
+      (!notIsfsOnly || (notIsfsOnly && notIsfs(f.uri))) &&
+      (!active || (active && new AtelierAPI(f.uri).active))
   );
   if (!folders.length) return;
   if (folders.length == 1) return folders[0];
@@ -864,7 +869,6 @@ export async function getWsFolder(
       }),
       {
         canPickMany: false,
-        ignoreFocusOut: true,
         matchOnDetail: true,
         title: title || "Pick a workspace folder",
       }