Merge remote branch 'origin/master' into edge

Author: automatic-merge

integration/vscode/ada/package.json

@@ -1021,7 +1021,13 @@
                             "args": [],
                             "cwd": "^\"\\${workspaceFolder}\"",
                             "stopAtEntry": false,
-                            "preLaunchTask": "ada: Build current project"
+                            "externalConsole": false,
+                            "preLaunchTask": "ada: Build current project",
+                            "setupCommands": {
+                                "description": "Enable pretty-printing for gdb",
+                                "text": "-enable-pretty-printing",
+                                "ignoreFailures": true
+                            }
                         }
                     }
                 ],

integration/vscode/ada/src/debugConfigProvider.ts

@@ -298,11 +298,6 @@ export class AdaInitialDebugConfigProvider implements vscode.DebugConfigurationP
  * GDB default setup options
  */
 const setupCmd = [
-    {
-        description: 'Catch all Ada exceptions',
-        text: 'catch exception',
-        ignoreFailures: true,
-    },
     {
         description: 'Enable pretty-printing for gdb',
         text: '-enable-pretty-printing',
@@ -461,5 +456,6 @@ function createAttachConfig(adaMain: AdaMain): AdaConfig {
          */
         // preLaunchTask: adaMain ? getBuildTaskName(adaMain) : BUILD_PROJECT_TASK_NAME,
         miDebuggerPath: getOrFindGdb(),
+        setupCommands: setupCmd,
     };
 }

integration/vscode/ada/test/general/debug.test.ts

@@ -28,11 +28,6 @@ suite('Dbg Cfgs', function () {
                 MIMode: 'gdb',
                 preLaunchTask: 'ada: Build main - src/main1.adb',
                 setupCommands: [
-                    {
-                        description: 'Catch all Ada exceptions',
-                        text: 'catch exception',
-                        ignoreFailures: true,
-                    },
                     {
                         description: 'Enable pretty-printing for gdb',
                         text: '-enable-pretty-printing',
@@ -48,6 +43,13 @@ suite('Dbg Cfgs', function () {
                 program: '${workspaceFolder}/obj/main1exec' + exe,
                 processId: '${command:pickProcess}',
                 MIMode: 'gdb',
+                setupCommands: [
+                    {
+                        description: 'Enable pretty-printing for gdb',
+                        text: '-enable-pretty-printing',
+                        ignoreFailures: true,
+                    },
+                ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },
             {
@@ -63,11 +65,6 @@ suite('Dbg Cfgs', function () {
                 MIMode: 'gdb',
                 preLaunchTask: 'ada: Build main - src/test.adb',
                 setupCommands: [
-                    {
-                        description: 'Catch all Ada exceptions',
-                        text: 'catch exception',
-                        ignoreFailures: true,
-                    },
                     {
                         description: 'Enable pretty-printing for gdb',
                         text: '-enable-pretty-printing',
@@ -83,6 +80,13 @@ suite('Dbg Cfgs', function () {
                 program: '${workspaceFolder}/obj/test' + exe,
                 processId: '${command:pickProcess}',
                 MIMode: 'gdb',
+                setupCommands: [
+                    {
+                        description: 'Enable pretty-printing for gdb',
+                        text: '-enable-pretty-printing',
+                        ignoreFailures: true,
+                    },
+                ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },
         ];