Merge remote-tracking branch 'upstream/master' into reduce-traffic

Author: isc-bsaviano

package.json

@@ -1488,6 +1488,7 @@
         "objectscript.multilineMethodArgs": {
           "markdownDescription": "List method arguments on multiple lines, if the server supports it. **NOTE:** Only supported on IRIS 2019.1.2, 2020.1.1+, 2021.1.0+ and subsequent versions! On all other versions, this setting will have no effect.",
           "type": "boolean",
+          "scope": "resource",
           "default": false
         },
         "objectscript.openClassContracted": {

src/api/index.ts

@@ -601,20 +601,25 @@ export class AtelierAPI {
   }
 
   // api v1+
-  public getDoc(name: string, format?: string, mtime?: number): Promise<Atelier.Response<Atelier.Document>> {
-    let params = {};
-    if (!format && config("multilineMethodArgs", this.configName) && this.config.apiVersion >= 4) {
-      format = "udl-multiline";
-    }
-    if (format) {
-      params = {
-        format,
-      };
-    }
+  public getDoc(name: string, scope: vscode.Uri | string, mtime?: number): Promise<Atelier.Response<Atelier.Document>> {
+    let params, headers;
     name = this.transformNameIfCsp(name);
-    const headers = {};
+    if (
+      this.config.apiVersion >= 4 &&
+      vscode.workspace
+        .getConfiguration(
+          "objectscript",
+          typeof scope == "string"
+            ? // If scope is a string, then it's a workspace folder name
+              vscode.workspace.workspaceFolders?.find((f) => f.name.toLowerCase() == scope.toLowerCase())
+            : scope
+        )
+        .get("multilineMethodArgs")
+    ) {
+      params = { format: "udl-multiline" };
+    }
     if (mtime && mtime > 0) {
-      headers["IF-NONE-MATCH"] = new Date(mtime).toISOString().replace(/T|Z/g, " ").trim();
+      headers = { "IF-NONE-MATCH": new Date(mtime).toISOString().replace(/T|Z/g, " ").trim() };
     }
     return this.request(1, "GET", `${this.ns}/doc/${name}`, null, params, headers);
   }

src/commands/compile.ts

@@ -34,7 +34,7 @@ import {
 } from "../utils";
 import { StudioActions } from "./studio";
 import { NodeBase, PackageNode, RootNode } from "../explorer/nodes";
-import { updateIndexForDocument } from "../utils/documentIndex";
+import { getUrisForDocument, updateIndexForDocument } from "../utils/documentIndex";
 
 async function compileFlags(): Promise<string> {
   const defaultFlags = config().compileFlags;
@@ -64,7 +64,7 @@ export async function checkChangedOnServer(file: CurrentTextFile | CurrentBinary
   const mtime =
     workspaceState.get(`${file.uniqueId}:mtime`, null) ||
     (await api
-      .getDoc(file.name)
+      .getDoc(file.name, file.uri)
       .then((data) => data.result)
       .then(async ({ ts, content }) => {
         const serverTime = Number(new Date(ts + "Z"));
@@ -225,7 +225,7 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
         const mtime = Number(new Date(doc.ts + "Z"));
         workspaceState.update(`${file.uniqueId}:mtime`, mtime > 0 ? mtime : undefined);
         if (notIsfs(file.uri)) {
-          const content = await api.getDoc(file.name).then((data) => data.result.content);
+          const content = await api.getDoc(file.name, file.uri).then((data) => data.result.content);
           exportedUris.add(file.uri.toString()); // Set optimistically
           await vscode.workspace.fs
             .writeFile(file.uri, Buffer.isBuffer(content) ? content : new TextEncoder().encode(content.join("\n")))
@@ -249,12 +249,11 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
 }
 
 export async function compile(docs: CurrentFile[], flags?: string): Promise<any> {
-  const conf = vscode.workspace.getConfiguration(
-    "objectscript",
-    vscode.workspace.getWorkspaceFolder(docs[0].uri) || docs[0].uri
-  );
+  const wsFolder = vscode.workspace.getWorkspaceFolder(docs[0].uri);
+  const conf = vscode.workspace.getConfiguration("objectscript", wsFolder || docs[0].uri);
   flags = flags || conf.get("compileFlags");
   const api = new AtelierAPI(docs[0].uri);
+  const docNames = docs.map((d) => d.name);
   return vscode.window
     .withProgress(
       {
@@ -264,18 +263,31 @@ export async function compile(docs: CurrentFile[], flags?: string): Promise<any>
       },
       (progress, token: vscode.CancellationToken) =>
         api
-          .asyncCompile(
-            docs.map((el) => el.name),
-            token,
-            flags
-          )
+          .asyncCompile(docNames, token, flags)
           .then((data) => {
             const info = docs.length > 1 ? "" : `${docs[0].name}: `;
             if (data.status && data.status.errors && data.status.errors.length) {
               throw new Error(`${info}Compile error`);
             } else if (!conf.get("suppressCompileMessages")) {
               vscode.window.showInformationMessage(`${info}Compilation succeeded.`, "Dismiss");
             }
+            if (wsFolder) {
+              // Make sure that we update the content for any
+              // other documents affected by this compilation
+              data.result.content.forEach((f) => {
+                if (docNames.includes(f.name)) return;
+                getUrisForDocument(f.name, wsFolder).forEach((u) => {
+                  docs.push({
+                    name: f.name,
+                    uri: u,
+                    uniqueId: `${wsFolder.name}:${f.name}`,
+                    // These two keys aren't used by loadChanges()
+                    workspaceFolder: wsFolder.name,
+                    fileName: u.fsPath,
+                  });
+                });
+              });
+            }
             return docs;
           })
           .catch(() => {

src/commands/export.ts

@@ -99,7 +99,7 @@ async function exportFile(wsFolderUri: vscode.Uri, namespace: string, name: stri
     outputChannel.appendLine(`Export '${name}' to '${fileUri.toString(true)}' - ${status}`);
 
   try {
-    const data = await api.getDoc(name);
+    const data = await api.getDoc(name, wsFolderUri);
     if (!data || !data.result) {
       throw new Error("Received malformed JSON object from server fetching document");
     }

src/providers/DocumentContentProvider.ts

@@ -249,7 +249,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
     const { csp, ns } = isfsConfig(uri);
     const fileName = csp ? uri.path.slice(1) : uri.path.split("/").slice(1).join(".");
     if (ns) api.setNamespace(ns);
-    const data = await api.getDoc(fileName);
+    const data = await api.getDoc(fileName, api.configName);
     if (Buffer.isBuffer(data.result.content)) {
       return "\nThis is a binary file.\n\nTo access its contents, export it to the local file system.";
     } else {

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -934,7 +934,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     const fileName = isfsDocumentName(uri, csp);
     const api = new AtelierAPI(uri);
     return api
-      .getDoc(fileName, undefined, cachedFile?.mtime)
+      .getDoc(fileName, uri, cachedFile?.mtime)
       .then((data) => data.result)
       .then(
         ({ ts, content }) =>
@@ -955,7 +955,9 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       )
       .catch((error) => {
         if (error?.statusCode == 304 && cachedFile) return cachedFile;
-        throw vscode.FileSystemError.FileNotFound(stringifyError(error) || uri);
+        const errArg = stringifyError(error) || uri;
+        if (error?.statusCode == 404) throw vscode.FileSystemError.FileNotFound(errArg);
+        throw vscode.FileSystemError.Unavailable(errArg);
       });
   }