Improved Get_Definition_At and Find_All_References

Author: raja-s

source/ada/lsp-ada_cross_reference_services.adb

@@ -28,44 +28,55 @@ package body LSP.Ada_Cross_Reference_Services is
       Include_Definition : Boolean := False) return Ref_Vector
    is
 
-      Context    : constant Analysis_Context := Definition.Unit.Context;
-
       References : Ref_Vector;
 
    begin
 
-      for N in Sources'Range loop
+      if not Definition.Is_Null then
 
          declare
 
-            Unit : constant Analysis_Unit := Context.Get_From_File
-              (Sources (N).Display_Full_Name);
+            Context : constant Analysis_Context := Definition.Unit.Context;
 
-            Match_Iterator : Traverse_Iterator'Class := Find
-              (Unit.Root,
-               Kind_Is (Ada_Identifier) and Text_Is (Definition.Text));
+         begin
 
-            Node : Ada_Node;
-            Node_Definition : Defining_Name;
+            for N in Sources'Range loop
 
-         begin
+               declare
+
+                  Unit            : constant Analysis_Unit :=
+                    Context.Get_From_File
+                      (Sources (N).Display_Full_Name);
+
+                  Match_Iterator  : Traverse_Iterator'Class := Find
+                    (Unit.Root,
+                     Kind_Is (Ada_Identifier) and Text_Is (Definition.Text));
+
+                  Node            : Ada_Node;
+                  Node_Definition : Defining_Name;
+
+               begin
+
+                  while (Match_Iterator.Next (Node)) loop
+
+                     Node_Definition := Node.P_Xref;
 
-            while (Match_Iterator.Next (Node)) loop
+                     if Node_Definition = Definition and then
+                       (Include_Definition or else
+                        Node.As_Identifier /= Definition.F_Name)
+                     then
+                        References.Append (Node);
+                     end if;
 
-               Node_Definition := Node.P_Xref;
+                  end loop;
 
-               if Node_Definition = Definition and then
-                 (Include_Definition or else
-                  Node.As_Identifier /= Definition.F_Name)
-               then
-                  References.Append (Node);
-               end if;
+               end;
 
             end loop;
 
          end;
 
-      end loop;
+      end if;
 
       return References;
 

source/ada/lsp-ada_documents.adb

@@ -116,47 +116,39 @@ package body LSP.Ada_Documents is
       end loop;
    end Get_Symbols;
 
-   ------------------------
-   -- Get_Declaration_At --
-   ------------------------
+   -----------------------
+   -- Get_Definition_At --
+   -----------------------
 
-   not overriding function Get_Declaration_At
+   not overriding function Get_Definition_At
      (Self     : Document;
       Position : LSP.Messages.Position)
       return Libadalang.Analysis.Defining_Name
    is
 
-      function Predicate (Node : Libadalang.Analysis.Ada_Node) return Boolean;
-
-      function Predicate
-        (Node : Libadalang.Analysis.Ada_Node) return Boolean
-      is
-
-         use Libadalang.Common;
-         use LSP.Types;
+      use Libadalang.Common;
+      use Langkit_Support.Slocs;
 
-         Node_Start_Range :
-         constant Langkit_Support.Slocs.Source_Location_Range :=
-           Sloc_Range (Data (Node.Token_Start));
+      Node : Libadalang.Analysis.Ada_Node := Self.Unit.Root.Lookup
+        ((Line   => Line_Number (Position.line) + 1,
+          Column => Column_Number (Position.character) + 1));
 
-         Node_End_Range :
-         constant Langkit_Support.Slocs.Source_Location_Range :=
-           Sloc_Range (Data (Node.Token_End));
+   begin
 
-         Line   : constant Line_Number  := Position.line;
-         Column : constant UTF_16_Index := Position.character;
+      while not Node.Is_Null and
+        Node.Kind /= Ada_Defining_Name and
+        Node.Kind /= Ada_Compilation_Unit
+      loop
+         Node := Node.Parent;
+      end loop;
 
-      begin
-         return Node.Kind = Ada_Defining_Name and
-           Line_Number (Node_Start_Range.Start_Line) - 1 = Line and
-           UTF_16_Index (Node_Start_Range.Start_Column) - 1 <= Column and
-           UTF_16_Index (Node_End_Range.End_Column) - 1 >= Column;
-      end Predicate;
+      if Node.Kind = Ada_Compilation_Unit then
+         raise No_Defining_Name_At_Position;
+      else
+         return Node.As_Defining_Name;
+      end if;
 
-   begin
-      return Libadalang.Iterators.Find_First
-        (Self.Unit.Root, Predicate'Access).As_Defining_Name;
-   end Get_Declaration_At;
+   end Get_Definition_At;
 
    ---------------------
    -- Get_Symbol_Kind --
@@ -302,7 +294,7 @@ package body LSP.Ada_Documents is
         (first =>
            (line      => LSP.Types.Line_Number (Value.Start_Line) - 1,
             character => LSP.Types.UTF_16_Index   --  FIXME (UTF16 index)!
-                           (Value.Start_Column) - 1),
+              (Value.Start_Column) - 1),
          last =>
            (line => LSP.Types.Line_Number (Value.End_Line) - 1,
             character => LSP.Types.UTF_16_Index  --  FIXME (UTF16 index)!

source/ada/lsp-ada_documents.ads

@@ -41,7 +41,9 @@ package LSP.Ada_Documents is
      (Self   : Document;
       Result : out LSP.Messages.SymbolInformation_Vector);
 
-   not overriding function Get_Declaration_At
+   No_Defining_Name_At_Position : exception;
+
+   not overriding function Get_Definition_At
      (Self     : Document;
       Position : LSP.Messages.Position)
       return Libadalang.Analysis.Defining_Name;

source/ada/lsp-ada_handlers.adb

@@ -113,19 +113,28 @@ package body LSP.Ada_Handlers is
       Response : in out LSP.Messages.Location_Response)
    is
 
-      Document : constant LSP.Ada_Documents.Document_Access :=
+      Document   : constant LSP.Ada_Documents.Document_Access :=
         Self.Context.Get_Document (Value.textDocument.uri);
 
-      References : constant LSP.Ada_Cross_Reference_Services.Ref_Vector :=
-        LSP.Ada_Cross_Reference_Services.Find_All_References
-          (Definition         => Document.Get_Declaration_At (Value.position),
-           Sources            => Self.Context.Get_Source_Files,
-           Include_Definition => Value.context.includeDeclaration);
-      --  This call to `Find_All_References` will later be replaced by a call
-      --  to a subprogram in Libadalang with the same functionality
+      Definition : Libadalang.Analysis.Defining_Name;
+
+      References : LSP.Ada_Cross_Reference_Services.Ref_Vector;
 
    begin
 
+      begin
+         Definition := Document.Get_Definition_At (Value.position);
+      exception
+         when LSP.Ada_Documents.No_Defining_Name_At_Position => return;
+      end;
+
+      References := LSP.Ada_Cross_Reference_Services.Find_All_References
+        (Definition         => Definition,
+         Sources            => Self.Context.Get_Source_Files,
+         Include_Definition => Value.context.includeDeclaration);
+      --  TODO: This call to `Find_All_References` should later be replaced by
+      --  a call to a subprogram in Libadalang with the same functionality
+
       for N in 1 .. Integer (References.Length) loop
 
          declare
@@ -136,11 +145,11 @@ package body LSP.Ada_Handlers is
             use Libadalang.Common;
 
             Start_Sloc_Range :
-            constant Langkit_Support.Slocs.Source_Location_Range :=
-              Sloc_Range (Data (Node.Token_Start));
+              constant Langkit_Support.Slocs.Source_Location_Range :=
+                Sloc_Range (Data (Node.Token_Start));
             End_Sloc_Range   :
-            constant Langkit_Support.Slocs.Source_Location_Range :=
-              Sloc_Range (Data (Node.Token_End));
+              constant Langkit_Support.Slocs.Source_Location_Range :=
+                Sloc_Range (Data (Node.Token_End));
 
             First_Position : constant LSP.Messages.Position :=
               (Line_Number (Start_Sloc_Range.Start_Line) - 1,