Skip to content

Commit cc4b80f

Browse files
Disable questions on multiple matches for GDB
Due to an issue with vscode-cpptools, see: microsoft/vscode-cpptools#11953 For eng/ide/ada_language_server#1590
1 parent 0e50e1a commit cc4b80f

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

integration/vscode/ada/package.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,11 +1033,18 @@
10331033
"stopAtEntry": false,
10341034
"externalConsole": false,
10351035
"preLaunchTask": "ada: Build current project",
1036-
"setupCommands": {
1037-
"description": "Enable pretty-printing for gdb",
1038-
"text": "-enable-pretty-printing",
1039-
"ignoreFailures": true
1040-
}
1036+
"setupCommands": [
1037+
{
1038+
"description": "Enable pretty-printing for gdb",
1039+
"text": "-enable-pretty-printing",
1040+
"ignoreFailures": true
1041+
},
1042+
{
1043+
"description": "Disable questions on multiple matches",
1044+
"text": "set multiple-symbols cancel",
1045+
"ignoreFailures": false
1046+
}
1047+
]
10411048
}
10421049
}
10431050
],

integration/vscode/ada/src/debugConfigProvider.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,23 @@ export class AdaInitialDebugConfigProvider implements vscode.DebugConfigurationP
295295
}
296296

297297
/**
298-
* GDB default setup options
298+
* GDB default setup options.
299+
* We enable pretty-printing by default and disable questions
300+
* on multiple matches due to an issue with vscode-cpptools
301+
* GDB integration
302+
* (see https://github.com/microsoft/vscode-cpptools/issues/11953)
299303
*/
300304
const setupCmd = [
301305
{
302306
description: 'Enable pretty-printing for gdb',
303307
text: '-enable-pretty-printing',
304308
ignoreFailures: true,
305309
},
310+
{
311+
description: 'Disable questions on multiple matches',
312+
text: 'set multiple-symbols cancel',
313+
ignoreFailures: false,
314+
},
306315
];
307316

308317
interface QuickPickAdaMain extends vscode.QuickPickItem {

0 commit comments

Comments
 (0)