Merge branch 'topic/vscode-launch-configs' into 'master'

Rename vscode launch configurations to meaningful names See merge request eng/ide/ada_language_server!1406
AdaCore · Oct 18, 2023 · c59023c · c59023c
2 parents 814fe42 + cc1bfaa
commit c59023c
Showing 1 changed file with 31 additions and 39 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,35 +4,7 @@
    "version": "0.2.0",
    "configurations": [
       {
-         "name": "(gdb) Attach",
-         "type": "cppdbg",
-         "request": "attach",
-         "program": "${workspaceFolder}/integration/vscode/ada/x64/linux/ada_language_server",
-         "processId": "${command:pickProcess}",
-         "MIMode": "gdb",
-         "setupCommands": [
-            {
-               "description": "Enable pretty-printing for gdb",
-               "text": "-enable-pretty-printing",
-               "ignoreFailures": true
-            },
-            {
-               "description": "Set Disassembly Flavor to Intel",
-               "text": "-gdb-set disassembly-flavor intel",
-               "ignoreFailures": true
-            }
-         ]
-      },
-      {
-         "type": "gdb",
-         "request": "launch",
-         "name": "Launch Program",
-         "target": ".obj/server/ada_language_server",
-         "cwd": "${workspaceRoot}",
-         "valuesFormatting": "parseText"
-      },
-      {
-         "name": "Launch Extension",
+         "name": "(vscode) Launch vscode with the Ada extension",
          "type": "extensionHost",
          "request": "launch",
          "runtimeExecutable": "${execPath}",
@@ -67,15 +39,7 @@
          }
       },
       {
-         "name": "Launch Extension Testsuite",
-         "type": "node",
-         "request": "launch",
-         "cwd": "${workspaceFolder}/integration/vscode/ada/",
-         "runtimeExecutable": "npm",
-         "runtimeArgs": ["run-script", "test"]
-      },
-      {
-         "name": "General Testsuite",
+         "name": "(vscode) Run testsuite 'general'",
          "type": "extensionHost",
          "request": "launch",
          "runtimeExecutable": "${execPath}",
@@ -109,7 +73,7 @@
          "internalConsoleOptions": "openOnSessionStart"
       },
       {
-         "name": "GNATtest Integration Testsuite",
+         "name": "(vscode) Run testsuite 'gnattest'",
          "type": "extensionHost",
          "request": "launch",
          "runtimeExecutable": "${execPath}",
@@ -142,6 +106,34 @@
          "preLaunchTask": "npm: pretest",
          // Switch to Debug Console to see test results
          "internalConsoleOptions": "openOnSessionStart"
+      },
+      {
+         "name": "(npm) Launch all vscode tests with npm",
+         "type": "node",
+         "request": "launch",
+         "cwd": "${workspaceFolder}/integration/vscode/ada/",
+         "runtimeExecutable": "npm",
+         "runtimeArgs": ["run-script", "test"]
+      },
+      {
+         "name": "(gdb) Attach",
+         "type": "cppdbg",
+         "request": "attach",
+         "program": "${workspaceFolder}/integration/vscode/ada/x64/linux/ada_language_server",
+         "processId": "${command:pickProcess}",
+         "MIMode": "gdb",
+         "setupCommands": [
+            {
+               "description": "Enable pretty-printing for gdb",
+               "text": "-enable-pretty-printing",
+               "ignoreFailures": true
+            },
+            {
+               "description": "Set Disassembly Flavor to Intel",
+               "text": "-gdb-set disassembly-flavor intel",
+               "ignoreFailures": true
+            }
+         ]
       }
    ],
    "inputs": [