Merge remote branch 'origin/master' into edge

AdaCore · May 21, 2024 · c49b537 · c49b537
2 parents 21ccc18 + 6084fa1
commit c49b537
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,18 +8,29 @@
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AdaCore/ada_language_server/tree/edge)
 
 This repository contains an implementation of the [Microsoft Language Server Protocol](https://microsoft.github.io/language-server-protocol/)
-for Ada/SPARK.
+for Ada/SPARK and GPR project files.
 
-Current features:
+Current features (general):
 
 * [GNAT project files](https://docs.adacore.com/gprbuild-docs/html/gprbuild_ug/gnat_project_manager.html) support.
 * Basic [Alire](https://alire.ada.dev/) support.
+
+For Ada/SPARK, we provide the following:
+
 * Code completion for names, keywords, aggregates, etc.
 * Code navigation, such as Go to Definition/Declaration, Find All References, Call Hierarchies, etc.
 * [Code refactoring](#refactoring-tools) like insert named associations, auto-add `with`-clauses, etc.
 * Document/Workspace symbol search.
 * Code folding and formatting.
 
+The Ada Language Server now also supports the GPR language, via the
+`--language-gpr` option, providing support for the most used LSP features
+such as navigation, outline and tooltips for GPR files. When this switch is
+present, the server will only support GPR files. To support both GPR and
+Ada/SPARK, you'll need to launch two instances of the server.
+You can refer to the [Supported LSP Server Requests](#supported-lsp-server-requests) 
+section for more information.
+
 We also provide [Visual Studio Code](https://code.visualstudio.com/)
 extension at
 [the VS Marketplace](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada) and at

diff --git a/integration/vscode/ada/package.json b/integration/vscode/ada/package.json
@@ -788,14 +788,25 @@
                     {
                         "id": "als-get-stated-setting",
                         "title": "Set a project file",
-                        "description": "Set the 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-open-project-file",
+                        "title": "GPR project file support",
+                        "description": "Open the GPR project file you have specified in the ``ada.projectFile`` setting. Open the ``Outline`` view to see all the entities (packages, switches...) of your GPR file.",
+                        "media": {
+                            "markdown": "media/settings.md"
+                        },
+                        "completionEvents": [
+                            "onLanguage:gpr"
+                        ]
+                    },
                     {
                         "id": "als-get-stated-debug",
                         "title": "Launch and debug",