Merge branch 'als_1739' into 'master'

Added extendedProject field for locations

See merge request eng/ide/ada_language_server!2160

Author: ogorodnik

doc/metaModel.patch.json

@@ -422,6 +422,15 @@
                   }
                },
                "optional": true
+            },
+            {
+               "name": "hidden",
+               "type": {
+                  "kind": "base",
+                  "name": "boolean"
+               },
+               "optional": true,
+               "documentation": "Set to True if the location is from the hidden source file (extended project)"
             }
          ]
       },

doc/reference_kinds.md

@@ -10,6 +10,8 @@ be 'write', 'parent', 'dispatching call', etc.
 
 We extend the result of `textDocument/references` by adding an
 extra field to the `Location` type:
+  alsKind field represents the reference kind
+  hidden field is set to True if the location is from the hidden source file (extended project)
 
 ```typescript
 
@@ -28,6 +30,7 @@ interface Location {
 	uri: DocumentUri;
 	range: Range;
         alsKind?: AlsReferenceKind[];
+        hidden?: boolean;
 }
 ```
 

liblsp_3_16/source/generated/lsp-message_io.adb

@@ -449,6 +449,8 @@ package body LSP.Message_IO is
                LSP.Messages.Span'Read (S, V.span);
             elsif Key = "alsKind" then
                AlsReferenceKind_Set'Read (S, V.alsKind);
+            elsif Key = "hidden" then
+               Optional_Boolean'Read (S, V.hidden);
             else
                JS.Skip_Value;
             end if;
@@ -471,6 +473,8 @@ package body LSP.Message_IO is
       LSP.Messages.Span'Write (S, V.span);
       JS.Key ("alsKind");
       AlsReferenceKind_Set'Write (S, V.alsKind);
+      JS.Key ("hidden");
+      Optional_Boolean'Write (S, V.hidden);
       JS.End_Object;
    end Write_Location;
 

liblsp_3_16/source/lsp-messages.ads

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2023, AdaCore                     --
+--                     Copyright (C) 2018-2025, 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- --
@@ -515,6 +515,7 @@ package LSP.Messages is
    --	uri: DocumentUri;
    --	range: Range;
    --   AlsKind?: AlsReferenceKind[];
+   --   hidden?: boolean;
    --}
    --```
    --
@@ -525,6 +526,7 @@ package LSP.Messages is
       uri     : DocumentUri;
       span    : LSP.Messages.Span;  --  range: is reserved word
       alsKind : AlsReferenceKind_Set := Empty_Set;
+      hidden  : Optional_Boolean;
    end record;
 
    overriding function "=" (Left, Right : Location) return Boolean;

liblsp_3_17/source/generated/lsp-inputs-part_9.adb

@@ -603,6 +603,12 @@ package body LSP.Inputs.Part_9 is
                   Read_A_Range (Handler, Value.a_range);
                when 3 =>  --  alsKind
                   Read_AlsReferenceKind_Set (Handler, Value.alsKind);
+               when 4 =>  --  hidden
+                  Value.hidden :=
+                    (Is_Set => True,
+                     Value  => <>);
+                  Value.hidden.Value := Handler.Boolean_Value;
+                  Handler.Read_Next;
                when others =>
                   Handler.Skip_Current_Value;
             end case;

liblsp_3_17/source/generated/lsp-outputs.adb

@@ -6682,6 +6682,10 @@ package body LSP.Outputs is
          Handler.Key_Name ("alsKind");
          Write_AlsReferenceKind_Set (Handler, Value.alsKind);
       end if;
+      if Value.hidden.Is_Set then
+         Handler.Key_Name ("hidden");
+         Handler.Boolean_Value (Value.hidden.Value);
+      end if;
       Handler.End_Object;
    end Write_Location;
 

liblsp_3_17/source/generated/lsp-structures.ads

@@ -3008,6 +3008,8 @@ package LSP.Structures is
 
       alsKind : LSP.Structures.AlsReferenceKind_Set;
 
+      hidden : Boolean_Optional;
+
    end record;
    --  Represents a location inside a resource, such as a line inside a text
    --  file.

source/ada/lsp-ada_documents.adb

@@ -1172,11 +1172,16 @@ package body LSP.Ada_Documents is
    function To_LSP_Location
      (Self    : Document;
       Segment : Langkit_Support.Slocs.Source_Location_Range;
-      Kinds   : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty)
+      Kinds   : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty;
+      Hidden  : Boolean := False)
       return LSP.Structures.Location
         is (uri     => Self.URI,
             a_range => Self.To_A_Range (Segment),
-            alsKind => Kinds);
+            alsKind => Kinds,
+            hidden  =>
+              (if Hidden
+               then (Is_Set => True, Value => True)
+               else (Is_Set => False)));
 
    ----------
    -- Unit --

source/ada/lsp-ada_documents.ads

@@ -63,7 +63,8 @@ package LSP.Ada_Documents is
    function To_LSP_Location
      (Self    : Document;
       Segment : Langkit_Support.Slocs.Source_Location_Range;
-      Kinds   : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty)
+      Kinds   : LSP.Structures.AlsReferenceKind_Set := LSP.Constants.Empty;
+      Hidden  : Boolean := False)
       return LSP.Structures.Location;
    --  Convert LAL's Source_Location_Range and document's uri to a LSP location
 

source/ada/lsp-ada_handlers-locations.adb

@@ -58,7 +58,8 @@ package body LSP.Ada_Handlers.Locations is
             Value : constant LSP.Structures.Location :=
               (uri     => URI,
                a_range => Locations.To_LSP_Range (Self, Unit, Token),
-               alsKind => LSP.Constants.Empty);
+               alsKind => LSP.Constants.Empty,
+               hidden  => (Is_Set => False));
          begin
             if not Filter.Contains (Value) then
                Result.Append (Value);
@@ -423,13 +424,22 @@ package body LSP.Ada_Handlers.Locations is
 
    begin
       if Doc /= null then
-         return Doc.To_LSP_Location (Sloc, Kinds);
+         return Doc.To_LSP_Location
+           (Segment => Sloc,
+            Kinds   => Kinds,
+            Hidden  => LSP.Utils.Is_From_Extended_Project
+              (Self.Project_Tree, File));
+
       else
          return
            (uri     => URI,
             a_range => To_LSP_Range
               (Context.Get_AU (GNATCOLL.VFS.Create_From_UTF8 (File)), Sloc),
-            alsKind => Kinds);
+            alsKind => Kinds,
+            hidden  =>
+              (if LSP.Utils.Is_From_Extended_Project (Self.Project_Tree, File)
+               then (Is_Set => True, Value => True)
+               else (Is_Set => False)));
       end if;
    end To_LSP_Location;
 
@@ -507,14 +517,22 @@ package body LSP.Ada_Handlers.Locations is
 
    begin
       if Doc /= null then
-         return Doc.To_LSP_Location (Sloc, Kind);
+         return Doc.To_LSP_Location
+           (Segment => Sloc,
+            Kinds   => Kind,
+            Hidden  => LSP.Utils.Is_From_Extended_Project
+              (Self.Project_Tree, Node.Unit.Get_Filename));
 
       else
          return
-           (uri => URI,
+           (uri     => URI,
             a_range => To_LSP_Range (Node.Unit, Sloc),
-            alsKind => Kind);
-
+            alsKind => Kind,
+            hidden  =>
+              (if LSP.Utils.Is_From_Extended_Project
+                   (Self.Project_Tree, Node.Unit.Get_Filename)
+               then (Is_Set => True, Value => True)
+               else (Is_Set => False)));
       end if;
    end To_LSP_Location;