Improved logging & naming.

Author: toinehartman

rascal-vscode-extension/src/test/vscode-suite/utils.ts

@@ -526,6 +526,7 @@ export function printRascalOutputOnFailure(channel: 'Language Parametric Rascal'
 
     const ZOOM_OUT_FACTOR = 5;
     const N_LOG_LINES = 100;
+    // We guess some locations where the logs can be, since we cannot easily retrieve those from VS Code.
     const TEST_STORAGE_DIRS = [
         path.join(path.resolve(), "uitests"),    // typical CI path
         path.join(os.tmpdir(), "vscode-uitests") // typical local path
@@ -538,24 +539,26 @@ export function printRascalOutputOnFailure(channel: 'Language Parametric Rascal'
         console.log(`***** ${channel} output for the failed tests: `);
 
         let foundLogs = false;
-        for (const p of TEST_STORAGE_DIRS) {
+        for (const vsCodeDir of TEST_STORAGE_DIRS) {
             try {
-                const logDir = path.join(p, "settings", "logs");
+                const logDir = path.join(vsCodeDir, "settings", "logs");
                 if (existsSync(logDir)) {
                     for (const entry of await readdir(logDir, {recursive: true})) {
                         if (entry.includes("usethesource.rascalmpl") && entry.includes(channel)) {
-                            foundLogs = true;
+                            console.log(`***** ${entry}`);
                             const contents = await readFile(path.join(logDir, entry), {encoding: "utf-8"});
                             console.log(contents.split('\n').splice(-N_LOG_LINES).join('\n'));
+                            foundLogs = true;
                         }
                     }
                 }
             } catch (e) {
-                console.log('Error capturing output: ', e);
+                console.log(`Error capturing logs in ${vsCodeDir}: `, e);
             }
         }
 
         if (!foundLogs) {
+            // Fall back to legacy copy-from-VS Code approach if there were no log files.
             const bbp = new BottomBarPanel();
             try {
                 for (let z = 0; z < ZOOM_OUT_FACTOR; z++) {