Fix issues with compileFolder and importFolder commands (#860)

Author: isc-bsaviano

src/commands/compile.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/utils/index.ts

@@ -113,6 +113,39 @@ export function isImportableLocalFile(file: vscode.TextDocument): boolean {
   return false;
 }
 
+export function currentFileFromContent(fileName: string, content: string): CurrentFile {
+  const uri = vscode.Uri.file(fileName);
+  const workspaceFolder = workspaceFolderOfUri(uri);
+  let name = "";
+  let ext = "";
+  if (fileName.split(".").pop().toLowerCase() === "cls") {
+    // Allow Unicode letters
+    const match = content.match(/^[ \t]*Class[ \t]+(%?[\p{L}\d]+(?:\.[\p{L}\d]+)+)/imu);
+    if (match) {
+      [, name, ext = "cls"] = match;
+    }
+  } else {
+    const match = content.match(/^ROUTINE ([^\s]+)(?:\s*\[\s*Type\s*=\s*\b([a-z]{3})\b)?/i);
+    if (match) {
+      [, name, ext = "mac"] = match;
+    } else {
+      [name, ext = "mac"] = path.basename(fileName).split(".");
+    }
+  }
+  name = `${name}.${ext}`;
+  const firstLF = content.indexOf("\n");
+
+  return {
+    content,
+    fileName,
+    uri,
+    workspaceFolder,
+    name,
+    uniqueId: `${workspaceFolder}:${name}`,
+    eol: firstLF > 0 && content[firstLF - 1] === "\r" ? vscode.EndOfLine.CRLF : vscode.EndOfLine.LF,
+  };
+}
+
 export function currentFile(document?: vscode.TextDocument): CurrentFile {
   document =
     document ||