Merge remote branch 'origin/master' into edge

Author: automatic-merge

source/ada/lsp-ada_contexts.ads

@@ -82,11 +82,6 @@ package LSP.Ada_Contexts is
    --  Release the memory associated to Self. You should not use the
    --  context after calling this.
 
-   --  function URI_To_File
-   --    (Self : Context;
-   --     URI  : LSP.Types.LSP_URI)
-   --     return Ada.Strings.UTF_Encoding.UTF_8_String;
-   --
    function URI_To_File
      (Self : Context;
       URI  : LSP.Structures.DocumentUri)

source/ada/lsp-ada_driver.adb

@@ -40,6 +40,7 @@ with GNATCOLL.Utils;
 with LSP.Ada_Commands;
 with LSP.Ada_Did_Change_Configurations;
 with LSP.Ada_Did_Change_Document;
+with LSP.Ada_References;
 with LSP.Ada_Handlers;
 with LSP.Ada_Handlers.Executables_Commands;
 with LSP.Ada_Handlers.Mains_Commands;
@@ -74,6 +75,7 @@ with LSP.Predefined_Completion;
 with LSP.Secure_Message_Loggers;
 with LSP.Server_Notifications.DidChange;
 with LSP.Server_Notifications.DidChangeConfiguration;
+with LSP.Server_Requests.References;
 with LSP.Servers;
 with LSP.Stdio_Streams;
 
@@ -180,6 +182,9 @@ procedure LSP.Ada_Driver is
      LSP.Ada_Did_Change_Document.Ada_Did_Change_Handler
        (Ada_Handler'Unchecked_Access);
 
+   Ada_References_Handler : aliased LSP.Ada_References.Ada_References_Handler
+       (Ada_Handler'Unchecked_Access);
+
    GPR_Did_Change_Doc_Handler : aliased
      LSP.GPR_Did_Change_Document.GPR_Did_Change_Handler
        (GPR_Handler'Unchecked_Access);
@@ -388,6 +393,10 @@ begin
            (LSP.Server_Notifications.DidChange.Notification'Tag,
             Ada_Did_Change_Doc_Handler'Unchecked_Access);
 
+         Server.Register_Handler
+           (LSP.Server_Requests.References.Request'Tag,
+            Ada_References_Handler'Unchecked_Access);
+
          Server.Run
            (Ada_Handler'Unchecked_Access,
             Tracer'Unchecked_Access,

source/ada/lsp-ada_handlers-call_hierarchy.adb

@@ -23,6 +23,7 @@ with Laltools.Common;
 with Laltools.Call_Hierarchy;
 
 with LSP.GNATCOLL_Tracers.Handle;
+with LSP.Ada_Handlers.Locations;
 with LSP.Utils;
 
 package body LSP.Ada_Handlers.Call_Hierarchy is
@@ -69,7 +70,7 @@ package body LSP.Ada_Handlers.Call_Hierarchy is
    procedure Find_Incoming_Calls
      (Self        : in out Message_Handler;
       Response    : in out LSP.Structures.CallHierarchyIncomingCall_Vector;
-      Filter      : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter      : in out LSP.Locations.File_Span_Sets.Set;
       Context     : LSP.Ada_Contexts.Context;
       Definition  : Libadalang.Analysis.Defining_Name)
    is
@@ -206,7 +207,7 @@ package body LSP.Ada_Handlers.Call_Hierarchy is
    procedure Find_Outgoing_Calls
      (Self        : in out Message_Handler;
       Response    : in out LSP.Structures.CallHierarchyOutgoingCall_Vector;
-      Filter      : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter      : in out LSP.Locations.File_Span_Sets.Set;
       Definition  : Libadalang.Analysis.Defining_Name)
    is
       use Laltools.Common.References_By_Subprogram;

source/ada/lsp-ada_handlers-call_hierarchy.ads

@@ -18,14 +18,14 @@
 with Libadalang.Analysis;
 
 with LSP.Ada_Contexts;
-with LSP.Ada_Handlers.Locations;
+with LSP.Locations;
 
 package LSP.Ada_Handlers.Call_Hierarchy is
 
    procedure Find_Incoming_Calls
      (Self        : in out Message_Handler;
       Response    : in out LSP.Structures.CallHierarchyIncomingCall_Vector;
-      Filter      : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter      : in out LSP.Locations.File_Span_Sets.Set;
       Context     : LSP.Ada_Contexts.Context;
       Definition  : Libadalang.Analysis.Defining_Name)
           with Pre => Definition.P_Basic_Decl.P_Is_Subprogram;
@@ -36,7 +36,7 @@ package LSP.Ada_Handlers.Call_Hierarchy is
    procedure Find_Outgoing_Calls
      (Self        : in out Message_Handler;
       Response    : in out LSP.Structures.CallHierarchyOutgoingCall_Vector;
-      Filter      : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter      : in out LSP.Locations.File_Span_Sets.Set;
       Definition  : Libadalang.Analysis.Defining_Name)
           with Pre => Definition.P_Basic_Decl.P_Is_Subprogram;
    --  Return the list of all the calls made in the subprogram pointed at by

source/ada/lsp-ada_handlers-locations.adb

@@ -38,7 +38,7 @@ package body LSP.Ada_Handlers.Locations is
    procedure Append_Location
      (Self   : in out Message_Handler;
       Result : in out LSP.Structures.Location_Vector;
-      Filter : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter : in out LSP.Locations.File_Span_Sets.Set;
       Node   : Libadalang.Analysis.Ada_Node'Class;
       Kinds  : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty) is
    begin
@@ -132,17 +132,6 @@ package body LSP.Ada_Handlers.Locations is
       end;
    end Get_Node_At;
 
-   ----------
-   -- Hash --
-   ----------
-
-   function Hash
-     (Value : LSP.Structures.Location) return Ada.Containers.Hash_Type is
-      use type Ada.Containers.Hash_Type;
-   begin
-      return Value.uri.Get_Hash + LSP.Utils.Hash (Value.a_range);
-   end Hash;
-
    ----------
    -- Sort --
    ----------

source/ada/lsp-ada_handlers-locations.ads

@@ -26,18 +26,10 @@ with Libadalang.Common;
 
 with LSP.Ada_Contexts;
 with LSP.Constants;
+with LSP.Locations;
 
 package LSP.Ada_Handlers.Locations is
 
-   function Hash
-     (Value : LSP.Structures.Location) return Ada.Containers.Hash_Type;
-
-   package File_Span_Sets is new Ada.Containers.Hashed_Sets
-     (Element_Type        => LSP.Structures.Location,
-      Hash                => Hash,
-      Equivalent_Elements => LSP.Structures."=",
-      "="                 => LSP.Structures."=");
-
    function To_LSP_Location
      (Self : in out Message_Handler'Class;
       Node : Libadalang.Analysis.Ada_Node'Class;
@@ -66,7 +58,7 @@ package LSP.Ada_Handlers.Locations is
    procedure Append_Location
      (Self   : in out Message_Handler;
       Result : in out LSP.Structures.Location_Vector;
-      Filter : in out LSP.Ada_Handlers.Locations.File_Span_Sets.Set;
+      Filter : in out LSP.Locations.File_Span_Sets.Set;
       Node   : Libadalang.Analysis.Ada_Node'Class;
       Kinds  : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty);
    --  Append given Node location to the Result.

source/ada/lsp-ada_handlers-project_loading.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2023, AdaCore                     --
+--                     Copyright (C) 2018-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -426,9 +426,7 @@ package body LSP.Ada_Handlers.Project_Loading is
          Self.Project_Tree.Update_Sources (With_Runtime => True);
 
       exception
-         when E : GPR2.Project_Error
-                | GPR2.Processing_Error
-                | GPR2.Attribute_Error =>
+         when E : others =>
 
             Self.Tracer.Trace_Exception (E);
 

source/ada/lsp-ada_handlers-renaming.adb

@@ -27,7 +27,7 @@ with LAL_Refactor.Safe_Rename;
 
 with LSP.Ada_Contexts;
 with LSP.Ada_Handlers.Locations;
-with LSP.Utils;
+with LSP.Locations;
 
 package body LSP.Ada_Handlers.Renaming is
 
@@ -52,14 +52,14 @@ package body LSP.Ada_Handlers.Renaming is
                      Result := @ + Ada.Containers.Hash_Type'Mod
                        (Item.TextEdit.newText.Hash);
 
-                     Result := @ + LSP.Utils.Hash (Item.TextEdit.a_range);
+                     Result := @ + LSP.Locations.Hash (Item.TextEdit.a_range);
 
                   when False =>
                      Result := @ + Ada.Containers.Hash_Type'Mod
                        (Item.AnnotatedTextEdit.newText.Hash);
 
                      Result := @ +
-                       LSP.Utils.Hash (Item.AnnotatedTextEdit.a_range);
+                       LSP.Locations.Hash (Item.AnnotatedTextEdit.a_range);
                end case;
             end loop;