Revert "test: run all debugger tests in a single variables.test.ts invocation"

This reverts commit 8d8423a.

After adding such thing strange exception started to show:

ListError [Breakpoints] Invalid Index 2

I don't know how to fix it, because this is not my error and stack
trace points to somewhere in VS Code source code. This fixes
by just splitting test by debugger and running them in different
sessions (I mean different VS Code windows).

Author: ashenBlade

.vscode-test.mjs

@@ -4,7 +4,7 @@ import { defineConfig } from '@vscode/test-cli';
 // npx vscode-test --config .vscode-test.mjs
 export default defineConfig([
     {
-        label: 'Tests',
+        label: 'Unit tests',
         files: 'out/test/**/*.test.js',
         mocha: {
             ui: 'tdd',
@@ -14,6 +14,7 @@ export default defineConfig([
         version: 'stable',
         workspaceFolder: './pgsrc/18',
         env: {
+            PGHH_DEBUGGER: 'cppdbg',
             PGHH_PG_VERSION: '18',
             PGHH_VSCODE_VERSION: 'stable',
             PGHH_TEST_MODE: 'vars,format,unit',

.vscode/tasks.json

@@ -15,19 +15,6 @@
 				"kind": "build",
 				"isDefault": true
 			}
-		},
-        {
-            "type": "npm",
-            "script": "test",
-            "group": {
-                "kind": "test",
-                "isDefault": true
-            },
-            "options": {
-                "env": {
-                    "PGHH_TEST_MODES": "vars,format,unit"
-                }
-            }
-        }
+		}
 	]
 }

src/test/README.md

@@ -53,7 +53,8 @@ There are useful flags that allows to specify which value range to use:
 
 ```bash
 ./src/test/test.sh --pg-versions="18 17 16" \
-                   --vscode-versions="stable 1.90"
+                   --vscode-versions="stable 1.90" \
+                   --debuggers="lldb"
 ```
 
 Use `--help` flag to get more info about.
@@ -96,3 +97,13 @@ You can use it when working with our custom members (i.e. number from `Bitmapset
 In other cases rely on *stable* parts - variable/member name or type.
 
 Reason: each DAP provider uses it's own syntax, so we might get failed assertion, even though everything works correctly.
+
+## Notes
+
+### Split by debugger
+
+There might be an idea to run variables tests with both cppdbg and codelldb in same window, but just have some sort of setup before changing debugger.
+Commit `8d8423a4ac36d1fa1ece8b6833e82564e9c4c99a` did exactly that, but after strange error emerged: `ListError [Breakpoints] Invalid Index 2`.
+This error comes from VS Code internals and is not my error, but because of it tests does not pass.
+
+Why this error happened I still don't know, but such split does not cause much inconvenience.

src/test/runTests.ts

@@ -5,6 +5,15 @@ import { downloadAndUnzipVSCode,
          resolveCliArgsFromVSCodeExecutablePath,
          runTests } from '@vscode/test-electron';
 import { getTestEnv } from './suite/env';
+import { unnullify } from '../error';
+
+function getDebuggerExtensionId(debuggerType: string) {
+    if (debuggerType === 'cppdbg') {
+        return 'ms-vscode.cpptools';
+    } else {
+        return 'vadimcn.vscode-lldb';
+    }
+}
 
 async function main() {
     /*
@@ -28,13 +37,11 @@ async function main() {
     /* Install required debugger extension */
     let extraArgs: string[] = [];
     if (testEnv.testDebugger()) {
-        extraArgs = [];
-        for (const dbgExt of ['ms-vscode.cpptools', 'vadimcn.vscode-lldb']) {
-            cp.spawnSync(cliPath, [...args, '--install-extension', dbgExt],
-                         { encoding: 'utf-8', stdio: 'inherit'});   
-            /* Disable warnings if any */
-            extraArgs.push('--enable-proposed-api', dbgExt);
-        }
+        const dbgExtId = getDebuggerExtensionId(unnullify(testEnv.debugger, 'testEnv.debugger'));
+        cp.spawnSync(cliPath, [...args, '--install-extension', dbgExtId],
+                     { encoding: 'utf-8', stdio: 'inherit'});
+        /* Disable warnings if any */
+        extraArgs = ['--enable-proposed-api', dbgExtId];
     }
 
     /*

src/test/suite/env.ts

@@ -23,17 +23,24 @@ export class TestEnv {
     pgVersion: string;
     /* Version of VS Code we are running on */
     vscodeVersion: string;
-    /* Which tests are enabled */
+    /* Debugger extension is used */
+    debugger: DebuggerType | undefined;
     testMode: TestMode;
 
     constructor(pgVersion: string,
                 vscodeVersion: string,
+                debuggerType: string | undefined,
                 testMode: string) {
         if (Number.isNaN(Number(pgVersion))) {
             throw new Error(`Invalid PostgreSQL version "${pgVersion}".` +
                             'Version must be in "major.minor" form.');
         }
 
+        if (   debuggerType !== undefined
+            && !(debuggerType === DebuggerType.CppDbg || debuggerType === DebuggerType.CodeLLDB)) {
+            throw new Error(`Debugger ${debuggerType} is not supported`);
+        }
+        
         let mode: TestMode = TestMode.None;
         if (testMode.indexOf('vars') !== -1) {
             mode |= TestMode.Debug;
@@ -48,12 +55,26 @@ export class TestEnv {
         if (mode === TestMode.None) {
             throw new Error(`No test modes specified: accept between "vars" and "format"`);
         }
+        
+        if (mode & TestMode.Debug && !debuggerType) {
+            throw new Error('Test mode is "vars", but debugger is not specified');
+        }
 
         this.pgVersion = pgVersion;
         this.vscodeVersion = vscodeVersion;
+        this.debugger = debuggerType;
         this.testMode = mode;
     }
 
+    /* Which debugger is used to test variables */
+    debuggerIsCodeLLDB() {
+        return this.debugger === 'lldb';
+    }
+
+    debuggerIsCppDbg() {
+        return this.debugger === 'cppdbg';
+    }
+    
     /* Determine which tests to run */
     testDebugger() {
         return this.testMode & TestMode.Debug;
@@ -94,5 +115,8 @@ export function getTestEnv(): TestEnv {
     const pgVersion = process.env.PGHH_PG_VERSION ?? defaultPostgresVersion;
     const vscodeVersion = process.env.PGHH_VSCODE_VERSION ?? defaultVsCodeVersion;
     const testMode = process.env.PGHH_TEST_MODE ?? defaultTestMode;
-    return new TestEnv(pgVersion, vscodeVersion, testMode);
+
+    /* Flag for variables tests */
+    const dbg = process.env.PGHH_DEBUGGER;
+    return new TestEnv(pgVersion, vscodeVersion, dbg, testMode);
 }

src/test/suite/formatting.test.ts

@@ -54,7 +54,7 @@ suite('Formatting', async function () {
         });
 
         env = getTestEnv();
-        unformattedFilePath = env.getWorkspaceFile('unformatted.c');
+        unformattedFilePath = env.getWorkspaceFile('unformatted.c');        
         expected = getFormattedFile(env);
     });