Merge branch 'topic/als.1455.diag_setting_refresh' into 'master'

Improve settings related to diagnostics

See merge request eng/ide/ada_language_server!1947

Author: AdrienBoulanger

doc/settings.md

@@ -108,6 +108,7 @@ Settings understood by the Ada Language Server itself, independently from the LS
 * [rootDir](#rootdir)
 * [enableDiagnostics](#enableddiagnostics)
 * [adaFileDiagnostics](#adafilediagnostics)
+* [gprFileDiagnostics](#gprfilediagnostics)
 * [projectDiagnostics](#projectdiagnostics)
 * [alireDiagnostics](#alirediagnostics)
 * [enableIndexing](#enableindexing)
@@ -236,6 +237,17 @@ The value is a boolean.
     'adaFileDiagnostics': false
 ```
 
+### gprFileDiagnostics
+
+You can explicitly deactivate the emission of diagnostics related to the
+edition of gpr Files via the `gprFileDiagnostics` key. By default,
+diagnostics are enabled.
+The value is a boolean.
+
+```javascript
+    'gprFileDiagnostics': false
+```
+
 ### projectDiagnostics
 
 You can explicitly deactivate the emission of diagnostics when loading a

integration/vscode/ada/package.json

@@ -426,7 +426,7 @@
                         "scope": "window",
                         "type": "boolean",
                         "default": null,
-                        "description": "Controls whether or not the Ada Language Server should emit project diagnostics into the VS Code Problems view."
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to project loading into the VS Code Problems view."
                     },
                     "ada.alireDiagnostics": {
                         "scope": "window",
@@ -438,7 +438,13 @@
                         "scope": "window",
                         "type": "boolean",
                         "default": null,
-                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to Ada files into the VS Code Problems view."
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of Ada files into the VS Code Problems view."
+                    },
+                    "ada.gprFileDiagnostics": {
+                        "scope": "window",
+                        "type": "boolean",
+                        "default": null,
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of GPR files into the VS Code Problems view."
                     }
                 }
             },

integration/vscode/ada/schemas/als-settings-schema.json

@@ -88,7 +88,12 @@
         "adaFileDiagnostics": {
             "type": "boolean",
             "default": true,
-            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to Ada Files into the VS Code Problems view."
+            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of Ada Files into the VS Code Problems view."
+        },
+        "gprFileDiagnostics": {
+            "type": "boolean",
+            "default": true,
+            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of GPR Files into the VS Code Problems view."
         },
         "foldComments": {
             "type": "boolean",

liblsp_3_16/source/lsp-client_notification_receivers.ads

@@ -19,6 +19,7 @@
 
 with LSP.Types;
 with LSP.Messages;
+with VSS.Strings;
 
 package LSP.Client_Notification_Receivers is
 
@@ -28,18 +29,21 @@ package LSP.Client_Notification_Receivers is
    --  Receiver of notification on LSP client side
 
    procedure On_Show_Message
-     (Self   : access Client_Notification_Receiver;
-      Params : LSP.Messages.ShowMessageParams) is abstract;
+     (Self     : access Client_Notification_Receiver;
+      Params   : LSP.Messages.ShowMessageParams;
+      Language : VSS.Strings.Virtual_String) is abstract;
    --  Process window/showMessage notification
 
    procedure On_Log_Message
      (Self    : access Client_Notification_Receiver;
-      Params : LSP.Messages.LogMessageParams) is abstract;
+      Params : LSP.Messages.LogMessageParams;
+      Language : VSS.Strings.Virtual_String) is abstract;
    --  Process window/logMessage notification
 
    procedure On_Publish_Diagnostics
-     (Self   : access Client_Notification_Receiver;
-      Params : LSP.Messages.PublishDiagnosticsParams) is abstract;
+     (Self     : access Client_Notification_Receiver;
+      Params   : LSP.Messages.PublishDiagnosticsParams;
+      Language : VSS.Strings.Virtual_String) is abstract;
    --  Process textDocument/publishDiagnostics notification
 
    function Get_Progress_Type

liblsp_3_16/source/lsp-messages-client_notifications.adb

@@ -22,35 +22,38 @@ package body LSP.Messages.Client_Notifications is
    -----------
 
    overriding procedure Visit
-     (Self    : LogMessage_Notification;
-      Reciver : access Client_Notification_Receiver'Class)
+     (Self     : LogMessage_Notification;
+      Receiver : access Client_Notification_Receiver'Class)
    is
    begin
-      Reciver.On_Log_Message (Self.params);
+      Receiver.On_Log_Message
+        (Self.params, VSS.Strings.Empty_Virtual_String);
    end Visit;
 
    -----------
    -- Visit --
    -----------
 
    overriding procedure Visit
-     (Self    : ShowMessage_Notification;
-      Reciver : access Client_Notification_Receiver'Class)
+     (Self     : ShowMessage_Notification;
+      Receiver : access Client_Notification_Receiver'Class)
    is
    begin
-      Reciver.On_Show_Message (Self.params);
+      Receiver.On_Show_Message
+        (Self.params, VSS.Strings.Empty_Virtual_String);
    end Visit;
 
    -----------
    -- Visit --
    -----------
 
    overriding procedure Visit
-     (Self    : PublishDiagnostics_Notification;
-      Reciver : access Client_Notification_Receiver'Class)
+     (Self     : PublishDiagnostics_Notification;
+      Receiver : access Client_Notification_Receiver'Class)
    is
    begin
-      Reciver.On_Publish_Diagnostics (Self.params);
+      Receiver.On_Publish_Diagnostics
+        (Self.params, VSS.Strings.Empty_Virtual_String);
    end Visit;
 
    -----------

liblsp_3_16/source/lsp-messages-client_notifications.ads

@@ -27,7 +27,7 @@ package LSP.Messages.Client_Notifications is
 
    procedure Visit
      (Self    : Client_Notification;
-      Reciver : access Client_Notification_Receiver'Class) is abstract;
+      Receiver : access Client_Notification_Receiver'Class) is abstract;
 
    package LogMessages is new LSP.Generic_Notifications
      (Client_Notification,
@@ -39,7 +39,7 @@ package LSP.Messages.Client_Notifications is
 
    overriding procedure Visit
      (Self    : LogMessage_Notification;
-      Reciver : access Client_Notification_Receiver'Class);
+      Receiver : access Client_Notification_Receiver'Class);
 
    package ShowMessages is new LSP.Generic_Notifications
      (Client_Notification,
@@ -51,7 +51,7 @@ package LSP.Messages.Client_Notifications is
 
    overriding procedure Visit
      (Self    : ShowMessage_Notification;
-      Reciver : access Client_Notification_Receiver'Class);
+      Receiver : access Client_Notification_Receiver'Class);
 
    package PublishDiagnostics is new LSP.Generic_Notifications
      (Client_Notification,
@@ -63,7 +63,7 @@ package LSP.Messages.Client_Notifications is
 
    overriding procedure Visit
      (Self    : PublishDiagnostics_Notification;
-      Reciver : access Client_Notification_Receiver'Class);
+      Receiver : access Client_Notification_Receiver'Class);
 
    package Progress_Params is new LSP.Generic_Notifications
      (Client_Notification,

source/ada/lsp-ada_configurations.adb

@@ -345,6 +345,11 @@ package body LSP.Ada_Configurations is
             then
                Self.Ada_File_Diagnostics_Enabled := JSON (Index).Boolean_Value;
 
+            elsif Check_Variable
+              (Name, JSON (Index).Kind, "gprFileDiagnostics", Boolean_Value)
+            then
+               Self.GPR_File_Diagnostics_Enabled := JSON (Index).Boolean_Value;
+
             elsif Check_Variable
               (Name, JSON (Index).Kind, "enableIndexing", Boolean_Value)
             then

source/ada/lsp-ada_configurations.ads

@@ -90,11 +90,17 @@ package LSP.Ada_Configurations is
 
    function Ada_File_Diagnostics_Enabled
      (Self : Configuration'Class) return Boolean;
-   --  Whether to publish file related diagnostics
+   --  Whether to publish ada file related diagnostics
+
+   function GPR_File_Diagnostics_Enabled
+     (Self : Configuration'Class) return Boolean;
+   --  Whether to publish diagnostics related to GPR files' edition. This
+   --  is used by GLS only and is different from Project_Diagnostics_Enabled.
 
    function Project_Diagnostics_Enabled
      (Self : Configuration'Class) return Boolean;
-   --  Whether to publish project related diagnostics
+   --  Whether to publish project related diagnostics. This is used by the
+   --  ALS only.
 
    function Alire_Diagnostics_Enabled
      (Self : Configuration'Class) return Boolean;
@@ -167,6 +173,7 @@ private
       Named_Notation_Threshold     : Natural := 3;
       Log_Threshold                : Natural := 10;
       Ada_File_Diagnostics_Enabled : Boolean := True;
+      GPR_File_Diagnostics_Enabled : Boolean := True;
       Project_Diagnostics_Enabled  : Boolean := True;
       Alire_Diagnostics_Enabled    : Boolean := True;
       Indexing_Enabled             : Boolean := True;
@@ -216,6 +223,11 @@ private
       return Boolean is
       (Self.Ada_File_Diagnostics_Enabled);
 
+   function GPR_File_Diagnostics_Enabled
+     (Self : Configuration'Class)
+      return Boolean is
+      (Self.GPR_File_Diagnostics_Enabled);
+
    function Project_Diagnostics_Enabled
      (Self : Configuration'Class)
       return Boolean is (Self.Project_Diagnostics_Enabled);

source/ada/lsp-ada_did_change_configurations.adb

@@ -64,6 +64,7 @@ package body LSP.Ada_Did_Change_Configurations is
          Self.Parent.Context.Reload_Project;
       end if;
 
+      Self.Parent.Context.Refresh_Diagnostics;
    exception
       when E : others =>
          Self.Parent.Context.Trace_Exception (E);