Merge branch 'topic/fix_gnatcov2' into 'master'

Fix GNAT Cov issue

See merge request eng/ide/ada_language_server!1494

Author: reznikmm

source/ada/lsp-ada_configurations.adb

@@ -347,17 +347,16 @@ package body LSP.Ada_Configurations is
       Reload : out Boolean)
    is
       use all type VSS.JSON.Streams.JSON_Stream_Element_Kind;
-      Index : Positive := JSON.First_Index;
+      Index : Positive := JSON.First_Index + 1;
 
    begin
-      if JSON.Is_Empty or else JSON (Index).Kind /= Start_Object then
-         Reload := False;
+      Reload := False;
+
+      if JSON.Is_Empty or else JSON.First_Element.Kind /= Start_Object then
          return;
-      else
-         Index := Index + 1;
       end if;
 
-      while Index <= JSON.Last_Index
+      while Index < JSON.Last_Index
         and then JSON (Index).Kind = Key_Name
       loop
          declare
@@ -370,6 +369,7 @@ package body LSP.Ada_Configurations is
               JSON (Index).Kind = Start_Object
             then
                Self.Parse_Ada (JSON, Index, Reload);
+               exit;
             else
                Skip_Value (JSON, Index);
             end if;

source/ada/lsp-ada_did_change_configurations.adb

@@ -83,7 +83,10 @@ package body LSP.Ada_Did_Change_Configurations is
 
       Reload : Boolean renames Result.Reload;
    begin
-      Result.Configuration := Self.Context.Get_Configuration.all;
+      Result.Configuration :=
+        LSP.Ada_Configurations.Configuration
+          (Self.Context.Get_Configuration.all);
+
       Result.Configuration.Read_JSON (Value.Params.settings, Reload);
 
       --  Always reload project if Project_Tree isn't ready

source/ada/lsp-ada_handlers.adb

@@ -4556,9 +4556,9 @@ package body LSP.Ada_Handlers is
 
    overriding procedure Set_Configuration
      (Self  : in out Message_Handler;
-      Value : LSP.Ada_Configurations.Configuration) is
+      Value : LSP.Ada_Configurations.Configuration'Class) is
    begin
-      Self.Configuration := Value;
+      Self.Configuration := LSP.Ada_Configurations.Configuration (Value);
    end Set_Configuration;
 
    -----------------------

source/ada/lsp-ada_handlers.ads

@@ -487,12 +487,12 @@ private
    ------------------
 
    overriding function Get_Configuration (Self : Message_Handler)
-     return access constant LSP.Ada_Configurations.Configuration is
+     return access constant LSP.Ada_Configurations.Configuration'Class is
        (Self.Configuration'Unchecked_Access);
 
    overriding procedure Set_Configuration
       (Self  : in out Message_Handler;
-       Value : LSP.Ada_Configurations.Configuration);
+       Value : LSP.Ada_Configurations.Configuration'Class);
 
    overriding procedure Increment_Project_Timestamp
      (Self : in out Message_Handler);

source/ada/lsp-ada_job_contexts.ads

@@ -35,11 +35,12 @@ package LSP.Ada_Job_Contexts is
         return GNATCOLL.VFS.Virtual_File is abstract;
 
    function Get_Configuration (Self : Ada_Job_Context)
-     return access constant LSP.Ada_Configurations.Configuration is abstract;
+     return access constant LSP.Ada_Configurations.Configuration'Class
+       is abstract;
 
    procedure Set_Configuration
       (Self  : in out Ada_Job_Context;
-       Value : LSP.Ada_Configurations.Configuration) is abstract;
+       Value : LSP.Ada_Configurations.Configuration'Class) is abstract;
 
    procedure Increment_Project_Timestamp (Self : in out Ada_Job_Context)
      is abstract;