Print output from all Rascal channels.

Author: toinehartman

.github/workflows/build.yaml

@@ -52,7 +52,7 @@ jobs:
         os: [buildjet-4vcpu-ubuntu-2204, windows-latest, macos-latest]
       fail-fast: true
     env:
-      CODE_VERSION: "1.90.2"
+      CODE_VERSION: "1.97.0"
     runs-on:  ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5

rascal-vscode-extension/package-lock.json

@@ -16,7 +16,7 @@
   },
   "version": "0.13.0-head",
   "engines": {
-    "vscode": "^1.90.0",
+    "vscode": "^1.97.0",
     "node": ">=20.9.0"
   },
   "type": "commonjs",
@@ -289,7 +289,7 @@
     "@types/mocha": "10.x",
     "@types/node": "20.x",
     "@types/tar": "6.x",
-    "@types/vscode": "1.90.0",
+    "@types/vscode": "1.97.0",
     "@types/yauzl": "2.x",
     "@typescript-eslint/eslint-plugin": "7.x",
     "@typescript-eslint/parser": "7.x",

rascal-vscode-extension/package.json

@@ -38,7 +38,7 @@ describe('DSL unregister/register race', function () {
 
     this.timeout(Delays.extremelySlow * 2);
 
-    printRascalOutputOnFailure('Language Parametric Rascal');
+    printRascalOutputOnFailure('Language Parametric Rascal', () => driver);
 
     async function loadPico() {
         const repl = new RascalREPL(bench, driver);
@@ -78,13 +78,14 @@ describe('DSL unregister/register race', function () {
     });
 
     for (let i = 0; i < 100; i++) {
-        if (!failed) {
-            it.only("Try trigger race", async function () {
-                const editor = await ide.openModule(TestWorkspace.picoFile);
-                await ide.hasSyntaxHighlighting(editor);
-                await ide.hasInlayHint(editor);
-            });
-        }
+        it.only("Try trigger race", async function () {
+            if (failed) {
+                this.skip();
+            }
+            const editor = await ide.openModule(TestWorkspace.picoFile);
+            await ide.hasSyntaxHighlighting(editor);
+            await ide.hasInlayHint(editor);
+        });
     }
 });
 

rascal-vscode-extension/src/test/vscode-suite/dsl-unregister-register-race.test.ts

@@ -47,7 +47,7 @@ parameterizedDescribe(function (errorRecovery: boolean) {
 
     this.timeout(Delays.extremelySlow * 2);
 
-    printRascalOutputOnFailure('Language Parametric Rascal');
+    printRascalOutputOnFailure('Language Parametric Rascal', () => driver);
 
     async function loadPico() {
         const repl = new RascalREPL(bench, driver);

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

@@ -42,7 +42,7 @@ describe('IDE', function () {
 
     this.timeout(Delays.extremelySlow * 2);
 
-    printRascalOutputOnFailure('Rascal MPL');
+    printRascalOutputOnFailure('Rascal MPL', () => driver);
 
     before(async () => {
         browser = VSBrowser.instance;

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

@@ -37,7 +37,7 @@ describe('REPL', function () {
 
     this.timeout(2 * Delays.extremelySlow);
 
-    printRascalOutputOnFailure('Rascal MPL');
+    printRascalOutputOnFailure('Rascal MPL', () => driver);
 
     before(async () => {
         browser = VSBrowser.instance;

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

@@ -451,9 +451,21 @@ export class IDEOperations {
 }
 
 
-async function showRascalOutput(bbp: BottomBarPanel, channel: string) {
+async function showRascalOutput(bbp: BottomBarPanel, channel: string, driver: WebDriver) {
     const outputView = await bbp.openOutputView();
-    await outputView.selectChannel(`${channel} Language Server`);
+    const channels = await outputView.getChannelNames();
+    const rascalChannels = channels.filter(c => c.includes("Rascal"));
+    if (rascalChannels.length === 1) {
+        await outputView.selectChannel(`${channel} Language Server`);
+    } else {
+        // Create a compound channel so we can see everything
+        const bench = new Workbench();
+        await bench.executeCommand("workbench.action.output.addCompoundLog");
+        const filter = await driver.wait(() => outputView.findElement(By.xpath("//div[contains(@class, 'quick-input-filter')]//input")));
+        await filter.sendKeys("rascal");
+        await filter.sendKeys(Key.SHIFT, Key.TAB, Key.NULL, Key.SPACE);
+        await filter.sendKeys(Key.TAB, Key.TAB, Key.ENTER);
+    }
     return outputView;
 }
 
@@ -471,7 +483,7 @@ async function assureDebugLevelLoggingIsEnabled() {
     await prompt.confirm();
 }
 
-export function printRascalOutputOnFailure(channel: 'Language Parametric Rascal' | 'Rascal MPL') {
+export function printRascalOutputOnFailure(channel: 'Language Parametric Rascal' | 'Rascal MPL', driver: () => WebDriver) {
 
     const ZOOM_OUT_FACTOR = 5;
     afterEach("print output in case of failure", async function () {
@@ -487,7 +499,7 @@ export function printRascalOutputOnFailure(channel: 'Language Parametric Rascal'
             let textLines: WebElement[] = [];
             let tries = 0;
             while (textLines.length === 0 && tries < 3) {
-                await showRascalOutput(bbp, channel);
+                await showRascalOutput(bbp, channel, driver());
                 textLines = await ignoreFails(bbp.findElements(By.className('view-line'))) ?? [];
                 tries++;
             }