Brett's comments

Author: isc-klu

src/api/atelier.d.ts

@@ -41,7 +41,7 @@ export interface Document {
   cat: "RTN" | "CLS" | "CSP" | "OTH";
   status: string;
   enc: boolean;
-  flags: number;
+  flags?: 0 | 1;
   content: string[] | Buffer;
   ext?: UserAction | UserAction[];
 }

src/api/index.ts

@@ -674,19 +674,7 @@ export class AtelierAPI {
     name: string,
     data: { enc: boolean; content: string[]; mtime: number },
     ignoreConflict?: boolean
-  ): Promise<
-    Atelier.Response<{
-      name: string;
-      db: string;
-      ts: string;
-      cat: "CLS" | "CSP" | "RTN" | "OTH";
-      status: string;
-      enc: boolean;
-      flags?: 0 | 1;
-      content: string[];
-      ext: any;
-    }>
-  > {
+  ): Promise<Atelier.Response<Atelier.Document>> {
     const params = { ignoreConflict };
     name = this.transformNameIfCsp(name);
     const headers = {};

src/commands/compile.ts

@@ -132,8 +132,9 @@ export async function importFile(
     if (data.result.flags === 1 && !willCompile) {
       // If flags === 1, putDoc returns new Storage definitions and the file must be a CLS
       const oldContent = new TextDecoder("utf-8").decode(await vscode.workspace.fs.readFile(file.uri));
-      const oldContentArray = oldContent.split(/\r?\n/g);
-      const newContentArray = updateStorage(oldContentArray, data.result.content);
+      const oldContentArray = oldContent.split(/\r?\n/);
+      const storage = Buffer.isBuffer(data.result.content) ? new TextDecoder().decode(data.result.content).split(/\r?\n/g) : data.result.content;
+      const newContentArray = updateStorage(oldContentArray, storage);
       if (oldContentArray.some((oldLine, index) => oldLine !== newContentArray[index])) {
         const EOL = ((<CurrentTextFile>file)?.eol ?? vscode.EndOfLine.LF) == vscode.EndOfLine.CRLF ? "\r\n" : "\n";
         const newContent = newContentArray.join(EOL);
@@ -304,14 +305,15 @@ function storageToMap(storage: string[]): Map<string, string> {
     if (line.startsWith("Storage ")) {
       k = line.slice("Storage ".length, line.length);
       v = [];
-    } else if (line === "{") {
-      continue;
-    } else if (line === "}") {
-      map.set(k, v.join("\n"));
-    } else if (line === "") {
-      continue;
-    } else {
-      v.push(line);
+    } else if (k !== undefined) {
+      if (line === "{") {
+        continue;
+      } else if (line === "}") {
+        map.set(k, v.join("\n"));
+        k = undefined;
+      } else {
+        v.push(line);
+      }
     }
   }
   return map;
@@ -392,7 +394,7 @@ export async function importAndCompile(document?: vscode.TextDocument, askFlags
     } else {
       await importFile(file, false);
     }
-  } catch (_) {
+  } catch {
     // importFile handles any server errors
   }
 }

src/utils/documentIndex.ts

@@ -276,7 +276,7 @@ export async function indexWorkspaceFolder(wsFolder: vscode.WorkspaceFolder): Pr
             debouncedCompile(change.addedOrChanged);
           }
         }
-      } catch (_) {
+      } catch {
         // importFile handles any server errors
       }
     }