Merge pull request intersystems-community#1124 from gjsjohnmurray/for-testingmanager

For testingmanager

Author: gjsjohnmurray

src/commands/compile.ts

@@ -96,6 +96,11 @@ async function importFile(
   if (typeof file.content === "string") {
     enc = false;
     content = file.content.split(/\r?\n/);
+
+    // Avoid appending a blank line on every save, which would cause a web app file to grow each time
+    if (content.length > 1 && content[content.length - 1] === "") {
+      content.pop();
+    }
   } else {
     // Base64 encoding must be in chunk size multiple of 3 and within the server's potential 32K string limit
     // Output is 4 chars for each 3 input, so 24573/3*4 = 32764
@@ -346,6 +351,10 @@ export async function importAndCompile(
             fileSystemProvider.fireFileChanged(file.uri);
           }
         }
+      } else if (file.uri.scheme === FILESYSTEM_SCHEMA || file.uri.scheme === FILESYSTEM_READONLY_SCHEMA) {
+        // Fire the file changed event to avoid VSCode alerting the user on the next folder-specific save (e.g. of settings.json) that
+        // "The content of the file is newer."
+        fileSystemProvider.fireFileChanged(file.unredirectedUri ?? file.uri);
       }
     });
 }

src/providers/DocumentContentProvider.ts

@@ -77,6 +77,12 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
     }
     let uri: vscode.Uri;
     if (wFolderUri && (wFolderUri.scheme === FILESYSTEM_SCHEMA || wFolderUri.scheme === FILESYSTEM_READONLY_SCHEMA)) {
+      // Avoid later adding a namespace=XXX queryparam when this is implied by the authority part of the workspace folder uri
+      // otherwise stopping at a breakpoint would load a second copy of the file
+      const authorityParts = wFolderUri.authority.split(":");
+      if (authorityParts.length === 2 && namespace?.toLowerCase() === authorityParts[1]) {
+        namespace = "";
+      }
       const flat = new URLSearchParams(wFolderUri.query).get("flat") == "1";
       const fileExt = name.split(".").pop();
       const fileName = name

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -24,7 +24,8 @@ export type Entry = File | Directory;
 export function generateFileContent(fileName: string, sourceContent: Buffer): { content: string[]; enc: boolean } {
   const sourceLines = sourceContent.toString().split("\n");
   const fileExt = fileName.split(".").pop().toLowerCase();
-  if (fileExt === "cls") {
+  const csp = fileName.startsWith("/");
+  if (fileExt === "cls" && !csp) {
     const className = fileName.split(".").slice(0, -1).join(".");
     const content: string[] = [];
     const preamble: string[] = [];
@@ -48,7 +49,7 @@ export function generateFileContent(fileName: string, sourceContent: Buffer): {
       content,
       enc: false,
     };
-  } else if (["int", "inc", "mac"].includes(fileExt)) {
+  } else if (["int", "inc", "mac"].includes(fileExt) && !csp) {
     sourceLines.shift();
     const routineName = fileName.split(".").slice(0, -1).join(".");
     const routineType = fileExt != "mac" ? `[Type=${fileExt.toUpperCase()}]` : "";
@@ -144,6 +145,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
   }
 
   public stat(uri: vscode.Uri): Promise<vscode.FileStat> {
+    uri = redirectDotvscodeRoot(uri);
     return this._lookup(uri);
   }
 
@@ -346,7 +348,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
           return Promise.reject();
         }
         // File doesn't exist on the server, and we are allowed to create it.
-        // Create content (typically a stub).
+        // Create content (typically a stub, unless the write-phase of a copy operation).
         const newContent = generateFileContent(fileName, content);
 
         // Write it to the server
@@ -434,6 +436,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
   }
 
   public async delete(uri: vscode.Uri, options: { recursive: boolean }): Promise<void> {
+    uri = redirectDotvscodeRoot(uri);
     const csp = isCSPFile(uri);
     const fileName = csp ? uri.path : uri.path.slice(1).replace(/\//g, ".");
     const params = new URLSearchParams(uri.query);
@@ -442,7 +445,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     if (fileName.startsWith(".")) {
       return;
     }
-    if (await this._lookup(uri).then((entry) => entry instanceof Directory)) {
+    if (await this._lookup(uri, true).then((entry) => entry instanceof Directory)) {
       // Get the list of documents to delete
       let toDeletePromise: Promise<any>;
       if (project) {
@@ -554,7 +557,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     }
     // Write the new file
     // This is going to attempt the write regardless of the user's response to the check out prompt
-    const api = new AtelierAPI(oldUri);
+    const api = new AtelierAPI(newUri);
     await api
       .putDoc(
         newFileName,

src/utils/index.ts

@@ -36,6 +36,7 @@ export interface CurrentFile {
   name: string;
   fileName: string;
   uri: vscode.Uri;
+  unredirectedUri?: vscode.Uri;
   workspaceFolder: string;
   uniqueId: string;
 }
@@ -284,6 +285,7 @@ export function currentFile(document?: vscode.TextDocument): CurrentTextFile {
     fileName,
     name,
     uri,
+    unredirectedUri: document.uri,
     eol,
     workspaceFolder,
     uniqueId,