Merge remote branch 'origin/master' into edge

Author: automatic-merge

liblsp_3_17/source/lsp-inputs-read_responseerror.adb

@@ -0,0 +1,42 @@
+--
+--  Copyright (C) 2024, AdaCore
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
+
+with VSS.Strings;
+
+procedure LSP.Inputs.Read_ResponseError
+  (Stream : in out VSS.JSON.Pull_Readers.JSON_Pull_Reader'Class;
+   Value  : out LSP.Errors.ResponseError)
+   is
+   use type VSS.Strings.Virtual_String;
+
+begin
+   pragma Assert (Stream.Is_Start_Object);
+   Stream.Read_Next;
+
+   while not Stream.Is_End_Object loop
+      pragma Assert (Stream.Is_Key_Name);
+
+      declare
+         Key : constant VSS.Strings.Virtual_String := Stream.Key_Name;
+
+      begin
+         Stream.Read_Next;
+
+         if Key = "code" then
+            LSP.Inputs.Read_ErrorCodes (Stream, Value.code);
+
+         elsif Key = "message" then
+            Value.message := Stream.String_Value;
+            Stream.Read_Next;
+
+         else
+            Stream.Skip_Current_Value;
+         end if;
+      end;
+   end loop;
+
+   Stream.Read_Next;
+end LSP.Inputs.Read_ResponseError;

liblsp_3_17/source/lsp-inputs-read_responseerror.ads

@@ -0,0 +1,12 @@
+--
+--  Copyright (C) 2024, AdaCore
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
+
+with VSS.JSON.Pull_Readers;
+with LSP.Errors;
+
+procedure LSP.Inputs.Read_ResponseError
+  (Stream : in out VSS.JSON.Pull_Readers.JSON_Pull_Reader'Class;
+   Value  : out LSP.Errors.ResponseError);

liblsp_3_17/source/lsp-structures-hashes.ads

@@ -12,6 +12,9 @@ package LSP.Structures.Hashes is
      (Item : LSP.Structures.Integer_Or_Virtual_String)
       return Ada.Containers.Hash_Type;
 
+   function Hash
+     (Item : LSP.Structures.ProgressToken) return Ada.Containers.Hash_Type;
+
 private
 
    function Hash
@@ -21,4 +24,11 @@ private
             when True  => Ada.Containers.Hash_Type'Mod (Item.Integer),
             when False => VSS.Strings.Hash (Item.Virtual_String));
 
+   function Hash
+     (Item : LSP.Structures.ProgressToken)
+      return Ada.Containers.Hash_Type is
+        (case Item.Is_Integer is
+            when True  => Ada.Containers.Hash_Type'Mod (Item.Integer),
+            when False => VSS.Strings.Hash (Item.Virtual_String));
+
 end LSP.Structures.Hashes;

source/server/lsp-secure_message_loggers.adb

@@ -175,6 +175,28 @@ package body LSP.Secure_Message_Loggers is
       Self.Output.New_Line (Ok);
    end On_FoldingRange_Response;
 
+   -------------------------------
+   -- On_IncomingCalls_Response --
+   -------------------------------
+
+   overriding procedure On_IncomingCalls_Response
+     (Self  : in out Client_Response_Logger;
+      Id    : LSP.Structures.Integer_Or_Virtual_String;
+      Value : LSP.Structures.CallHierarchyIncomingCall_Vector_Or_Null)
+   is
+      Ok : Boolean := True;
+   begin
+      --  Hide response, because it could be lengthly and expose names
+      Self.Output.Put ("'callHierarchy/incomingCalls'", Ok);
+      Self.Put_Id (Id, Ok);
+      Self.Output.Put (" result : len=", Ok);
+
+      Self.Output.Put
+        (VSS.Strings.To_Virtual_String (Value.Length'Wide_Wide_Image), Ok);
+
+      Self.Output.New_Line (Ok);
+   end On_IncomingCalls_Response;
+
    ----------------------------
    -- On_References_Response --
    ----------------------------

source/server/lsp-secure_message_loggers.ads

@@ -80,6 +80,11 @@ package LSP.Secure_Message_Loggers is
       Id    : LSP.Structures.Integer_Or_Virtual_String;
       Value : LSP.Structures.Symbol_Result);
 
+   overriding procedure On_IncomingCalls_Response
+     (Self  : in out Client_Response_Logger;
+      Id    : LSP.Structures.Integer_Or_Virtual_String;
+      Value : LSP.Structures.CallHierarchyIncomingCall_Vector_Or_Null);
+
    type Server_Notification_Logger is
      new LSP.Server_Notification_Loggers.Server_Notification_Logger
        with null record;