Merge remote branch 'origin/master' into edge

Author: automatic-merge

README.md

@@ -99,7 +99,7 @@ but it understands these options:
 * `--config=<FILE>` - Full path to a JSON file containing the server's configuration
 * `--help` - Display supported command like options and exit.
 
-You can turn some debugging and experimental features trought
+You can turn some debugging and experimental features through
 [the traces file](doc/traces.md).
 
 The server also gets configuration via `workspace/didChangeConfiguration`
@@ -140,8 +140,6 @@ formatting might no succeed on incomplete/illegal code.
 
   Source directories from imported projects should be added in a [workspace file](https://code.visualstudio.com/docs/editor/workspaces#_multiroot-workspaces). If you already have a workspace file, the extension will propose you to automatically add all the source directories coming from imported projects to your workspace automatically at startup.
 
-* **Debugging**: some manual work is needed in order to debug Ada code. In particular, you will need a `launch.json` file that describes your debugging configuration. All the steps needed for debugging are described [here](https://github.com/AdaCore/ada_language_server/wiki/Getting-Started#debug-hello_worldadb).
-
 ### Bug Reporting
 
 You can use the VS Code `Issue Reporter` to report issues. Just click on the `Help -> Report Issue` menu, select `An extension` for the `File on` entry and `Language Support for Ada` for the extension name. Put as many information you can in the description, like steps to reproduce, stacktraces or system information (VS Code automatically includes it by default). This will create a GitHub issue in the [Ada Language Server](https://github.com/AdaCore/ada_language_server/) repository.

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

@@ -1,50 +1,27 @@
 # 🔨 Build a project
 
-Use "auto-detected tasks" to
- * ⚙ Build whole project
+Use "auto-detected tasks" (i.e: `gnat` tasks in the `Run Task` dialog) to
+ * ⚙ Build the whole project
  * ✅ Check errors in the current file
- * 🔎 Lauch `gnatprove` to verify the code
+ * 🔎 Launch `gnatprove` to verify your SPARK code, if any (you can find the tool [here](https://github.com/alire-project/GNAT-FSF-builds/releases))
 
 ## 🚀 Launch
 
-Use embedded terminal to launch your executable.
+Open a new terminal to launch your executable once it has been built.
 
 ## 🐞 Debug
 
 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:
+The extension provides default debug configurations for all the mains of your
+project. You can debug the executable of your choice by opening the
+`Run and Debug` panel and then by clicking on the `Run and Debug` button.
+You can also run directly the `Debug: Start Debugging` command instead of using the UI. In some circumstances the UI may offer a selection of languages, in which case select `Ada`.
+The extension will then propose you to select the main you want to debug if your project contains several mains.
 
-```
-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).
+If you want to customize GDB's behavior or if you need to add custom arguments, you
+will have to create a `launch.json` file: this can be done through the
+`create a launch.json file` link button in the `Run and Debug` panel or directly via
+the `Debug: Add Configuration` command.

integration/vscode/ada/media/settings.md

@@ -5,7 +5,7 @@ the extension will use the first project file found in the root project
 folder.
 
 ⚙ You can change settings per workspace or per user: generally we recommend to
-change the project file setting in the desired workspace, since project files
+change the project file settings in the desired workspace, since project files
 are usually workspace-specific.
 
 📋 [List of Ada settings](https://github.com/AdaCore/ada_language_server/blob/master/doc/settings.md)

integration/vscode/ada/media/welcome.md

@@ -1,8 +1,8 @@
 # ☀ Welcome to Ada!
 
-Take a few minutes to learn about the functionality provided by the Ada extension.
+Take a few minutes to learn about the features provided by the Ada extension.
 
-Use this extension to enable Ada/SPARK support in VS Code.
+Use this extension to develop in Ada/SPARK in VS Code.
 
 📖 Take a look at our [WiKi site](https://github.com/AdaCore/ada_language_server/wiki) with tutorials and demos:
 * [Tutorial: Using Ada in VS Code](https://github.com/AdaCore/ada_language_server/wiki/Getting-Started)