Merge branch 'intersystems-community:master' into colorize-output

Author: a-boertien

package-lock.json

@@ -1194,7 +1194,7 @@
     "glob": "^7.1.6",
     "iconv-lite": "^0.6.0",
     "mkdirp": "^1.0.4",
-    "node-fetch": "3.1.1",
+    "node-fetch-cjs": "3.1.1",
     "vscode-cache": "^0.3.0",
     "vscode-debugadapter": "^1.41.0",
     "vscode-debugprotocol": "^1.41.0",

package.json

@@ -45,7 +45,7 @@ export interface ServerInfo {
 
 export interface SearchMatch {
   text: string;
-  line?: number;
+  line?: string | number;
   member?: string;
   attr?: string;
   attrline?: number;

src/api/atelier.d.ts

@@ -1,8 +1,6 @@
-// import fetch from "node-fetch";
-// mod.cjs
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const fetch = (...args) => import("node-fetch").then(({ default: fetch }) => fetch(...args));
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { default: fetch } = require("node-fetch-cjs");
+
 import * as httpModule from "http";
 import * as httpsModule from "https";
 import * as url from "url";

src/api/index.ts

@@ -13,7 +13,15 @@ import {
   workspaceState,
 } from "../extension";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
-import { currentFile, CurrentFile, currentWorkspaceFolder, outputChannel, uriOfWorkspaceFolder } from "../utils";
+import {
+  currentFile,
+  CurrentFile,
+  currentFileFromContent,
+  currentWorkspaceFolder,
+  outputChannel,
+  throttleRequests,
+  uriOfWorkspaceFolder,
+} from "../utils";
 import { PackageNode } from "../explorer/models/packageNode";
 import { NodeBase } from "../explorer/models/nodeBase";
 
@@ -372,16 +380,18 @@ export async function namespaceCompile(askFlags = false): Promise<any> {
 
 function importFiles(files, noCompile = false) {
   return Promise.all<CurrentFile>(
-    files.map((file) =>
-      vscode.workspace
-        .openTextDocument(file)
-        .then(currentFile)
-        .then((curFile) =>
-          importFile(curFile).then((data) => {
-            outputChannel.appendLine("Imported file: " + curFile.fileName);
-            return curFile;
-          })
-        )
+    files.map(
+      throttleRequests((file) =>
+        fs.promises
+          .readFile(file, { encoding: "utf8" })
+          .then((content) => currentFileFromContent(file, content))
+          .then((curFile) =>
+            importFile(curFile).then((data) => {
+              outputChannel.appendLine("Imported file: " + curFile.fileName);
+              return curFile;
+            })
+          )
+      )
     )
   ).then(noCompile ? Promise.resolve : compile);
 }

src/commands/compile.ts

@@ -1,8 +1,9 @@
 import * as vscode from "vscode";
 import * as url from "url";
-import { AtelierAPI } from "../../api";
 import { StudioOpenDialog } from "../../queries";
 import { studioOpenDialogFromURI } from "../../utils/FileProviderUtil";
+import { notNull } from "../../utils";
+import { DocumentContentProvider } from "../DocumentContentProvider";
 
 export class FileSearchProvider implements vscode.FileSearchProvider {
   /**
@@ -32,40 +33,26 @@ export class FileSearchProvider implements vscode.FileSearchProvider {
       filter = "";
     }
     let counter = 0;
+    if (token.isCancellationRequested) {
+      return;
+    }
     return studioOpenDialogFromURI(options.folder, { flat: true, filter: filter })
       .then((data) => {
         return data.result.content;
       })
       .then((data: StudioOpenDialog[]) => {
-        const api = new AtelierAPI(options.folder);
         return data
           .map((item: StudioOpenDialog) => {
-            // item.Type only matters here if it is 5 (CSP)
-            if (item.Type == "5" && !csp) {
+            if (token.isCancellationRequested) {
               return null;
             }
-            if (item.Type !== "5") {
-              if (item.Name.startsWith("%") && api.ns !== "%SYS") {
-                return null;
-              }
-              // Convert dotted name to slashed one, treating the likes of ABC.1.int or DEF.T1.int in the same way
-              // as the Studio dialog does.
-              const nameParts = item.Name.split(".");
-              const dotParts = nameParts
-                .slice(-2)
-                .join(".")
-                .match(/^[A-Z]?\d*[.](mac|int|inc)$/)
-                ? 3
-                : 2;
-              item.Name = nameParts.slice(0, -dotParts).join("/") + "/" + nameParts.slice(-dotParts).join(".");
-            }
             if (!options.maxResults || ++counter <= options.maxResults) {
-              return vscode.Uri.parse(`${options.folder.scheme}://${options.folder.authority}/${item.Name}`, true);
+              return DocumentContentProvider.getUri(item.Name, "", "", true, options.folder);
             } else {
               return null;
             }
           })
-          .filter((el) => el !== null);
+          .filter(notNull);
       });
   }
 }