Merge remote-tracking branch 'upstream/master' into dtl

Author: isc-bsaviano

package-lock.json

@@ -581,22 +581,22 @@
         },
         {
           "command": "vscode-objectscript.addItemsToProject",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && explorerResourceIsRoot && !listMultiSelection",
+          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && resourcePath =~ /^\\/?$/ && !listMultiSelection",
           "group": "objectscript_prj@1"
         },
         {
           "command": "vscode-objectscript.removeFromProject",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && !explorerResourceIsRoot && !listMultiSelection",
+          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && !(resourcePath =~ /^\\/?$/) && !listMultiSelection",
           "group": "objectscript_prj@2"
         },
         {
           "command": "vscode-objectscript.removeItemsFromProject",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && explorerResourceIsRoot && !listMultiSelection",
+          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && resourcePath =~ /^\\/?$/ && !listMultiSelection",
           "group": "objectscript_prj@2"
         },
         {
           "command": "vscode-objectscript.modifyProjectMetadata",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && explorerResourceIsRoot && !listMultiSelection",
+          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && resource =~ /project%3D/ && resourcePath =~ /^\\/?$/ && !listMultiSelection",
           "group": "objectscript_prj@3"
         },
         {
@@ -1289,7 +1289,11 @@
                   "type": "string"
                 },
                 "internalPort": {
-                  "description": "Target port inside the service in docker-compose.",
+                  "description": "Target webserver port inside the service in docker-compose.",
+                  "type": "number"
+                },
+                "internalSuperserverPort": {
+                  "description": "Target superserver port inside the service in docker-compose.",
                   "type": "number"
                 },
                 "file": {
@@ -1795,7 +1799,7 @@
     "eslint-plugin-promise": "^7.1.0",
     "glob": "^11.0.1",
     "globals": "^15.12.0",
-    "mocha": "^9.1.3",
+    "mocha": "^11.1.0",
     "path-browserify": "^1.0.1",
     "prettier": "^3.3.1",
     "ts-loader": "^9.5.1",

package.json

@@ -18,6 +18,7 @@ import { currentWorkspaceFolder, outputChannel, outputConsole } from "../utils";
 const DEFAULT_API_VERSION = 1;
 const DEFAULT_SERVER_VERSION = "2016.2.0";
 import * as Atelier from "./atelier";
+import { isfsConfig } from "../utils/FileProviderUtil";
 
 // Map of the authRequest promises for each username@host:port target to avoid concurrency issues
 const authRequestMap = new Map<string, Promise<any>>();
@@ -30,6 +31,7 @@ interface ConnectionSettings {
   https: boolean;
   host: string;
   port: number;
+  superserverPort?: number;
   pathPrefix: string;
   ns: string;
   username: string;
@@ -67,6 +69,9 @@ export class AtelierAPI {
     const wsKey = this.configName.toLowerCase();
     const host = this.externalServer ? this._config.host : workspaceState.get(wsKey + ":host", this._config.host);
     const port = this.externalServer ? this._config.port : workspaceState.get(wsKey + ":port", this._config.port);
+    const superserverPort = this.externalServer
+      ? this._config.superserverPort
+      : workspaceState.get(wsKey + ":superserverPort", this._config.superserverPort);
     const password = workspaceState.get(wsKey + ":password", this._config.password);
     const apiVersion = workspaceState.get(wsKey + ":apiVersion", DEFAULT_API_VERSION);
     const serverVersion = workspaceState.get(wsKey + ":serverVersion", DEFAULT_SERVER_VERSION);
@@ -80,6 +85,7 @@ export class AtelierAPI {
       https,
       host,
       port,
+      superserverPort,
       pathPrefix,
       ns,
       username,
@@ -120,9 +126,9 @@ export class AtelierAPI {
             workspaceFolderName = parts[0];
             namespace = parts[1];
           } else {
-            const params = new URLSearchParams(wsOrFile.query);
-            if (params.has("ns") && params.get("ns") != "") {
-              namespace = params.get("ns");
+            const { ns } = isfsConfig(wsOrFile);
+            if (ns) {
+              namespace = ns;
             }
           }
         } else {
@@ -138,10 +144,6 @@ export class AtelierAPI {
     this.setConnection(workspaceFolderName || currentWorkspaceFolder(), namespace);
   }
 
-  public get enabled(): boolean {
-    return this._config.active;
-  }
-
   public setNamespace(namespace: string): void {
     this.namespace = namespace;
   }
@@ -211,6 +213,7 @@ export class AtelierAPI {
         webServer: { scheme, host, port, pathPrefix = "" },
         username,
         password,
+        superServer,
       } = getResolvedConnectionSpec(serverName, config("intersystems.servers", workspaceFolderName).get(serverName));
       this._config = {
         serverName,
@@ -221,6 +224,7 @@ export class AtelierAPI {
         ns,
         host,
         port,
+        superserverPort: superServer.port,
         username,
         password,
         pathPrefix,
@@ -241,6 +245,7 @@ export class AtelierAPI {
           webServer: { scheme, host, port, pathPrefix = "" },
           username,
           password,
+          superServer,
         } = resolvedSpec;
         this._config = {
           serverName: "",
@@ -251,6 +256,7 @@ export class AtelierAPI {
           ns,
           host,
           port,
+          superserverPort: superServer.port,
           username,
           password,
           pathPrefix,

src/api/index.ts

@@ -11,6 +11,7 @@ import {
 } from "../extension";
 import { cspAppsForUri, handleError, notIsfs } from "../utils";
 import { pickProject } from "./project";
+import { isfsConfig, IsfsUriParam } from "../utils/FileProviderUtil";
 
 /**
  * @param message The prefix of the message to show when the server manager API can't be found.
@@ -143,9 +144,7 @@ export async function addServerNamespaceToWorkspace(resource?: vscode.Uri): Prom
     return;
   }
   // Generate the name
-  const params = new URLSearchParams(uri.query);
-  const project = params.get("project");
-  const csp = params.has("csp");
+  const { csp, project } = isfsConfig(uri);
   const name = `${project ? `${project} - ${serverName}:${namespace}` : !csp ? `${serverName}:${namespace}` : ["", "/"].includes(uri.path) ? `${serverName}:${namespace} web files` : `${serverName} (${uri.path})`}${
     scheme == FILESYSTEM_READONLY_SCHEMA && !project ? " (read-only)" : ""
   }`;
@@ -188,7 +187,7 @@ export async function getServerManagerApi(): Promise<any> {
 /** Prompt the user to fill in the `path` and `query` of `uri`. */
 async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefined> {
   if (notIsfs(uri)) return;
-  const params = new URLSearchParams(uri.query);
+  const { project, csp, system, generated, mapped, filter } = isfsConfig(uri);
   const api = new AtelierAPI(uri);
 
   // Prompt the user for the files to show
@@ -211,9 +210,7 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
         detail: "Choose an existing project, or create a new one.",
       },
     ];
-    quickPick.activeItems = [
-      params.has("project") ? quickPick.items[2] : params.has("csp") ? quickPick.items[1] : quickPick.items[0],
-    ];
+    quickPick.activeItems = [project ? quickPick.items[2] : csp ? quickPick.items[1] : quickPick.items[0]];
 
     quickPick.onDidChangeSelection((items) => {
       switch (items[0].label) {
@@ -258,7 +255,7 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
         // Catch handler reported the error already
         return;
       } else if (cspApps.length == 0) {
-        vscode.window.showWarningMessage(`No web applications are configured to use namespace ${api.ns}.`, "Dismiss");
+        vscode.window.showWarningMessage(`No web applications are configured in namespace ${api.ns}.`, "Dismiss");
         return;
       }
     }
@@ -292,43 +289,43 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
     if (!newPath) {
       return;
     }
-    newParams = "csp";
+    newParams = IsfsUriParam.CSP;
   } else if (filterType == "project") {
     // Prompt for project
     const project = await pickProject(new AtelierAPI(uri));
     if (!project) {
       return;
     }
-    newParams = `project=${project}`;
+    newParams = `${IsfsUriParam.Project}=${project}`;
   } else {
     // Prompt the user for other query parameters
     const items = [
       {
         label: "$(filter) Filter",
         detail: "Comma-delimited list of search options, e.g. '*.cls,*.inc,*.mac,*.int'",
-        picked: params.has("filter"),
-        value: "filter",
+        picked: filter != "",
+        value: IsfsUriParam.Filter,
       },
       {
         label: "$(server-process) Show Generated",
         detail: "Also show files tagged as generated, e.g. by compilation.",
-        picked: params.has("generated"),
-        value: "generated",
+        picked: generated,
+        value: IsfsUriParam.Generated,
       },
       {
         label: "$(references) Hide Mapped",
         detail: `Hide files that are mapped into ${api.ns} from another code database.`,
-        picked: params.has("mapped"),
-        value: "mapped",
+        picked: !mapped,
+        value: IsfsUriParam.Mapped,
       },
     ];
     if (api.ns != "%SYS") {
       // Only show system item for non-%SYS namespaces
       items.push({
         label: "$(library) Show System",
         detail: "Also show '%' items and INFORMATION.SCHEMA items.",
-        picked: params.has("system"),
-        value: "system",
+        picked: system,
+        value: IsfsUriParam.System,
       });
     }
     const otherParams = await vscode.window.showQuickPick(items, {
@@ -340,37 +337,29 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
       return;
     }
     // Build the new query parameter string
-    params.delete("csp");
-    params.delete("project");
-    params.delete("filter");
-    params.delete("flat");
-    params.delete("generated");
-    params.delete("mapped");
-    params.delete("system");
-    params.delete("type");
+    const params = new URLSearchParams();
     for (const otherParam of otherParams) {
       switch (otherParam.value) {
-        case "filter": {
+        case IsfsUriParam.Filter: {
           // Prompt for filter
-          const filter = await vscode.window.showInputBox({
+          const newFilter = await vscode.window.showInputBox({
             title: "Enter a filter string.",
             ignoreFocusOut: true,
-            value: params.get("filter"),
+            value: filter,
             placeHolder: "*.cls,*.inc,*.mac,*.int",
             prompt:
               "Patterns are comma-delimited and may contain both * (zero or more characters) and ? (a single character) as wildcards. To exclude items, prefix the pattern with a single quote.",
           });
-          if (filter && filter.length) {
-            params.set(otherParam.value, filter);
+          if (newFilter && newFilter.length) {
+            params.set(otherParam.value, newFilter);
           }
           break;
         }
-        case "generated":
-        case "system":
-          params.set(otherParam.value, "1");
-          break;
-        case "mapped":
+        case IsfsUriParam.Mapped:
           params.set(otherParam.value, "0");
+          break;
+        default: // system and generated
+          params.set(otherParam.value, "1");
       }
     }
     newParams = params.toString();

src/commands/addServerNamespaceToWorkspace.ts

@@ -23,14 +23,16 @@ import {
   exportedUris,
   handleError,
   isClassDeployed,
+  isClassOrRtn,
   notIsfs,
   notNull,
   outputChannel,
+  RateLimiter,
   routineNameTypeRegex,
-  throttleRequests,
 } from "../utils";
 import { StudioActions } from "./studio";
 import { NodeBase, PackageNode, RootNode } from "../explorer/nodes";
+import { updateIndexForDocument } from "../utils/documentIndex";
 
 async function compileFlags(): Promise<string> {
   const defaultFlags = config().compileFlags;
@@ -226,6 +228,10 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
             file.uri,
             Buffer.isBuffer(content) ? content : new TextEncoder().encode(content.join("\n"))
           );
+          if (isClassOrRtn(file.uri)) {
+            // Update the document index
+            updateIndexForDocument(file.uri, undefined, undefined, content);
+          }
           exportedUris.push(file.uri.toString());
         } else if (filesystemSchemas.includes(file.uri.scheme)) {
           fileSystemProvider.fireFileChanged(file.uri);
@@ -414,9 +420,10 @@ export async function namespaceCompile(askFlags = false): Promise<any> {
 
 async function importFiles(files: vscode.Uri[], noCompile = false) {
   const toCompile: CurrentFile[] = [];
+  const rateLimiter = new RateLimiter(50);
   await Promise.allSettled<void>(
-    files.map(
-      throttleRequests((uri: vscode.Uri) => {
+    files.map((uri) =>
+      rateLimiter.call(async () => {
         return vscode.workspace.fs
           .readFile(uri)
           .then((contentBytes) => {
@@ -661,7 +668,7 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     return;
   }
   // Filter out non-ISC files
-  uris = uris.filter((uri) => ["cls", "mac", "int", "inc"].includes(uri.path.split(".").pop().toLowerCase()));
+  uris = uris.filter(isClassOrRtn);
   if (uris.length == 0) {
     vscode.window.showErrorMessage("No classes or routines were selected.", "Dismiss");
     return;
@@ -711,9 +718,10 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     docs.map((e) => e.name)
   );
   // Import the files
+  const rateLimiter = new RateLimiter(50);
   return Promise.allSettled<string>(
-    docs.map(
-      throttleRequests((doc: { name: string; content: string; uri: vscode.Uri }) => {
+    docs.map((doc) =>
+      rateLimiter.call(async () => {
         // Allow importing over deployed classes since the XML import
         // command and SMP, terminal, and Studio imports allow it
         return importFileFromContent(doc.name, doc.content, api, false, true).then(() => {