Merge remote branch 'origin/master' into edge

Author: automatic-merge

integration/vscode/Code Samples/docker/.vscode/launch.json

@@ -3,25 +3,21 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "(gdb) Build & debug",
 			"preLaunchTask": "build",
-			"type": "gdb",
+			"name": "Ada - Build & Debug (unix)",
+			"type": "cppdbg",
 			"request": "launch",
-			"cwd": "${workspaceFolder}",
-			"valuesFormatting": "parseText",
-            "windows": {
-				"target": "${workspaceRoot}/obj/hello.exe",
-                "MIMode": "gdb",
-                "miDebuggerPath": "C:/GNAT/bin/gdb.exe" // Path to gdb on windows
-            },
-            "linux": {
-				"target": "${workspaceRoot}/obj/hello",
-                "MIMode": "gdb"
-            },
-            "osx": {
-				"target": "${workspaceRoot}/obj/hello",
-                "MIMode": "lldb"
-            }
+			"program": "${workspaceFolder}/obj/hello",
+			"cwd": "${workspaceFolder}"
 		},
+		{
+			"preLaunchTask": "build",
+			"name": "Ada - Build & Debug (Windows)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/obj/hello.exe",
+			"externalConsole": true,
+			"cwd": "${workspaceFolder}"
+		}
 	]
-}
+}

integration/vscode/Code Samples/hello/.vscode/extensions.json

@@ -3,25 +3,21 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "(gdb) Build & debug",
 			"preLaunchTask": "build",
-			"type": "gdb",
+			"name": "Ada - Build & Debug (unix)",
+			"type": "cppdbg",
 			"request": "launch",
-			"cwd": "${workspaceFolder}",
-			"valuesFormatting": "parseText",
-            "windows": {
-				"target": "${workspaceRoot}/obj/hello.exe",
-                "MIMode": "gdb",
-                "miDebuggerPath": "C:/GNAT/bin/gdb.exe" // Path to gdb on windows
-            },
-            "linux": {
-				"target": "${workspaceRoot}/obj/hello",
-                "MIMode": "gdb"
-            },
-            "osx": {
-				"target": "${workspaceRoot}/obj/hello",
-                "MIMode": "lldb"
-            }
+			"program": "${workspaceFolder}/obj/hello",
+			"cwd": "${workspaceFolder}"
 		},
+		{
+			"preLaunchTask": "build",
+			"name": "Ada - Build & Debug (Windows)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/obj/hello.exe",
+			"externalConsole": true,
+			"cwd": "${workspaceFolder}"
+		}
 	]
 }

integration/vscode/Code Samples/hello/.vscode/launch.json

@@ -11,4 +11,40 @@ Use embedded terminal to launch your executable.
 
 ## 🐞 Debug
 
-Install Native Debug and configure `launch.json` to run the debugger.
+The [ms-vscode.cpptools](https://github.com/microsoft/vscode-cpptools) extension
+is automatically installed along with this extension, allowing to use its
+integration for GDB to debug Ada code.
+
+You will just need to add a proper debug configuration in your `launch.json`
+file. Let's consider a basic `.gpr` project, which produces a
+`main` executable in an `obj` directory:
+
+```
+project Default is
+
+   for Main use ("main.adb");
+   for Object_Dir use "obj";
+
+end Default;
+
+```
+
+A basic `launch.json` file which allows to debug the produced `main`
+executable would be:
+
+```
+{
+  "name": "Ada Debugging",
+  "type": "cppdbg",
+  "request": "launch",
+  "program": "${workspaceFolder}/obj/main",
+  "cwd": "${workspaceFolder}"
+}
+
+```
+
+You will then be able to go to the `Run and Debug` VS Code panel
+in order to run the newly added debugger.
+
+You can find more information about how to configure the debugger
+[here](https://code.visualstudio.com/docs/cpp/launch-json-reference).

integration/vscode/ada/media/launch-debug.md

@@ -6,14 +6,14 @@
     "publisher": "AdaCore",
     "license": "GPL-3.0",
     "engines": {
-        "vscode": "^1.64.2"
+        "vscode": "^1.67.0"
     },
     "categories": [
         "Programming Languages",
         "Extension Packs"
     ],
     "extensionPack": [
-        "webfreak.debug"
+        "ms-vscode.cpptools"
     ],
     "activationEvents": [
         "onLanguage:ada",