Merge remote branch 'origin/master' into edge

Author: automatic-merge

integration/vscode/ada/media/settings.md

@@ -1,9 +1,12 @@
 # Configure the extension
 
-☝ Make sure to configure active project file `*.gpr`.
-Otherwise the extension will use a project file in the root project filder.
+☝ Make sure to configure the active `*.gpr` project file, otherwise
+the extension will use the first project file found in the root project
+folder.
 
-⚙ You can change settings per project or per user.
+⚙ 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
+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 find about Ada extension features.
+Take a few minutes to learn about the functionality provided by the Ada extension.
 
-Use this extension to enable Ada/SPARK support in VS Code editor.
+Use this extension to enable Ada/SPARK support 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)

integration/vscode/ada/package.json

@@ -465,33 +465,36 @@
                     {
                         "id": "als-get-stated-welcome",
                         "title": "Welcome to Ada extension!",
-                        "description": "This short walkthrough introduces Ada extension.",
+                        "description": "This short walkthrough introduces the Ada extension.",
                         "media": {
                             "markdown": "media/welcome.md"
                         }
                     },
                     {
                         "id": "als-get-stated-setting",
                         "title": "Set a project file",
-                        "description": "Set active project file in the `ada.projectFile` setting.\n [Open Settings](command:workbench.action.openSettings)",
+                        "description": "Set the active project file in the `ada.projectFile` setting.\n [Open Settings](command:workbench.action.openSettings)",
                         "media": {
                             "markdown": "media/settings.md"
-                        }
+                        },
+                        "completionEvents": [
+                            "onSettingChanged:ada.projectFile"
+                        ]
                     },
                     {
                         "id": "als-get-stated-debug",
                         "title": "Launch and debug",
-                        "description": "Install **Native Debug** extension to run debugger.\n [Install extension](command:workbench.extensions.search)",
+                        "description": "Use the pre-installed **C/C++** extension to debug Ada code.",
                         "media": {
                             "markdown": "media/launch-debug.md"
                         },
                         "completionEvents": [
-                            "extensionInstalled:webfreak.debug"
+                            "onCommand:workbench.action.debug.start"
                         ]
                     },
                     {
                         "id": "als-get-stated-github",
-                        "title": "Report issues or contribute",
+                        "title": "Report issues or contribute to the extension",
                         "description": "This extension is an open source software. Feel free to [open an issue](https://github.com/AdaCore/ada_language_server/issues) or [contribute on GitHub](https://github.com/AdaCore/ada_language_server/pulls)!",
                         "media": {
                             "image": "media/github.jpg",
@@ -535,4 +538,4 @@
         "vscode-languageclient": "7.0.0",
         "ws": "8.5.0"
     }
-}
+}