Merge remote branch 'origin/master' into edge

Author: automatic-merge

.vscode/launch.json

@@ -4,12 +4,24 @@
    "version": "0.2.0",
    "configurations": [
       {
-         "type": "gdb",
+         "name": "(gdb) Attach",
+         "type": "cppdbg",
          "request": "attach",
-         "name": "Attach to PID",
-         "target": "${input:pid}",
-         "cwd": "${workspaceRoot}",
-         "valuesFormatting": "parseText"
+         "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",

integration/vscode/ada/package.json

@@ -581,6 +581,37 @@
                     }
                 ]
             }
+        ],
+        "debuggers": [
+            {
+                "type": "ada",
+                "label": "Ada",
+                "languages": [
+                    "ada",
+                    "gpr",
+                    "GNAT Project"
+                ],
+                "when": "ADA_PROJECT_CONTEXT",
+                "configurationSnippets": [
+                    {
+                        "label": "Ada: Debugger Launch",
+                        "description": "Launch configuration for Ada debugging.",
+                        "body": {
+                            "type": "cppdbg",
+                            "request": "launch",
+                            "name": "Ada: Debugger Launch",
+                            "program": "^\"\\${workspaceFolder}/\\${command:ada.getOrAskForProgram}\"",
+                            "args": [],
+                            "cwd": "^\"\\${workspaceFolder}\"",
+                            "stopAtEntry": false,
+                            "preLaunchTask": "ada: Build current project"
+                        }
+                    }
+                ],
+                "variables": {
+                    "AskForProgram": "ada.getOrAskForProgram"
+                }
+            }
         ]
     },
     "devDependencies": {

integration/vscode/ada/src/commands.ts

@@ -1,10 +1,11 @@
 import * as vscode from 'vscode';
 import { SymbolKind } from 'vscode';
-import { getEnclosingSymbol } from './gnatTaskProvider';
-import { mainLogChannel } from './extension';
 import { ContextClients } from './clients';
+import { getOrAskForProgram } from './debugConfigProvider';
+import { mainLogChannel } from './extension';
+import { getEnclosingSymbol } from './gnatTaskProvider';
 
-export function RegisterCommands(context: vscode.ExtensionContext, clients: ContextClients) {
+export function registerCommands(context: vscode.ExtensionContext, clients: ContextClients) {
     context.subscriptions.push(
         vscode.commands.registerCommand('ada.otherFile', clients.otherFileHandler)
     );
@@ -24,6 +25,15 @@ export function RegisterCommands(context: vscode.ExtensionContext, clients: Cont
             clients.gprClient.outputChannel.show()
         )
     );
+
+    // This is a hidden command that gets called in the default debug
+    // configuration snippet that gets offered in the launch.json file.
+    context.subscriptions.push(
+        vscode.commands.registerCommand('ada.getOrAskForProgram', async () => {
+            const p = await getOrAskForProgram();
+            return p;
+        })
+    );
 }
 /**
  * Add a subprogram box above the subprogram enclosing the cursor's position, if any.