Merge branch 'topic/eng/ide/ada_language_server#1590' into 'master'

Disable questions on multiple matches for GDB

See merge request eng/ide/ada_language_server!1896

Author: AnthonyLeonardoGracio

integration/vscode/ada/package.json

@@ -1033,11 +1033,18 @@
                             "stopAtEntry": false,
                             "externalConsole": false,
                             "preLaunchTask": "ada: Build current project",
-                            "setupCommands": {
-                                "description": "Enable pretty-printing for gdb",
-                                "text": "-enable-pretty-printing",
-                                "ignoreFailures": true
-                            }
+                            "setupCommands": [
+                                {
+                                    "description": "Enable pretty-printing for gdb",
+                                    "text": "-enable-pretty-printing",
+                                    "ignoreFailures": true
+                                },
+                                {
+                                    "description": "Disable questions on multiple matches",
+                                    "text": "set multiple-symbols cancel",
+                                    "ignoreFailures": false
+                                }
+                            ]
                         }
                     }
                 ],

integration/vscode/ada/src/debugConfigProvider.ts

@@ -182,7 +182,6 @@ export function initializeConfig(main: AdaMain, name?: string): AdaConfig {
         type: ADA_DEBUG_BACKEND_TYPE,
         name: name ?? (main ? `Ada: Debug main - ${main.mainRelPath()}` : 'Ada: Debugger Launch'),
         request: 'launch',
-        targetArchitecture: process.arch,
         cwd: '${workspaceFolder}',
         program: main
             ? `\${workspaceFolder}/${main.execRelPath()}`
@@ -295,14 +294,23 @@ export class AdaInitialDebugConfigProvider implements vscode.DebugConfigurationP
 }
 
 /**
- * GDB default setup options
+ * GDB default setup options.
+ * We enable pretty-printing by default and disable questions
+ * on multiple matches due to an issue with vscode-cpptools
+ * GDB integration
+ * (see https://github.com/microsoft/vscode-cpptools/issues/11953)
  */
 const setupCmd = [
     {
         description: 'Enable pretty-printing for gdb',
         text: '-enable-pretty-printing',
         ignoreFailures: true,
     },
+    {
+        description: 'Disable questions on multiple matches',
+        text: 'set multiple-symbols cancel',
+        ignoreFailures: false,
+    },
 ];
 
 interface QuickPickAdaMain extends vscode.QuickPickItem {

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

@@ -19,7 +19,6 @@ suite('Dbg Cfgs', function () {
                 type: 'cppdbg',
                 name: 'Ada: Debug main - src/main1.adb',
                 request: 'launch',
-                targetArchitecture: 'x64',
                 cwd: '${workspaceFolder}',
                 program: '${workspaceFolder}/obj/main1exec' + exe,
                 stopAtEntry: false,
@@ -33,6 +32,11 @@ suite('Dbg Cfgs', function () {
                         text: '-enable-pretty-printing',
                         ignoreFailures: true,
                     },
+                    {
+                        description: 'Disable questions on multiple matches',
+                        ignoreFailures: false,
+                        text: 'set multiple-symbols cancel',
+                    },
                 ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },
@@ -49,14 +53,18 @@ suite('Dbg Cfgs', function () {
                         text: '-enable-pretty-printing',
                         ignoreFailures: true,
                     },
+                    {
+                        description: 'Disable questions on multiple matches',
+                        ignoreFailures: false,
+                        text: 'set multiple-symbols cancel',
+                    },
                 ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },
             {
                 type: 'cppdbg',
                 name: 'Ada: Debug main - src/test.adb',
                 request: 'launch',
-                targetArchitecture: 'x64',
                 cwd: '${workspaceFolder}',
                 program: '${workspaceFolder}/obj/test' + exe,
                 stopAtEntry: false,
@@ -70,6 +78,11 @@ suite('Dbg Cfgs', function () {
                         text: '-enable-pretty-printing',
                         ignoreFailures: true,
                     },
+                    {
+                        description: 'Disable questions on multiple matches',
+                        ignoreFailures: false,
+                        text: 'set multiple-symbols cancel',
+                    },
                 ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },
@@ -86,6 +99,11 @@ suite('Dbg Cfgs', function () {
                         text: '-enable-pretty-printing',
                         ignoreFailures: true,
                     },
+                    {
+                        description: 'Disable questions on multiple matches',
+                        ignoreFailures: false,
+                        text: 'set multiple-symbols cancel',
+                    },
                 ],
                 miDebuggerPath: getOrFindGdb() ?? '<undefined>',
             },