Merge remote branch 'origin/master' into edge

Author: automatic-merge

source/gnatdoc-comments-extractor.adb

@@ -315,6 +315,7 @@ package body GNATdoc.Comments.Extractor is
                                 | Ada_Generic_Subp_Decl
                                 | Ada_Package_Body
                                 | Ada_Package_Decl
+                                | Ada_Package_Renaming_Decl
                                 | Ada_Subp_Body
                                 | Ada_Subp_Decl
                                 | Ada_Null_Subp_Decl
@@ -2339,6 +2340,7 @@ package body GNATdoc.Comments.Extractor is
       Is_Private    : out Boolean;
       Messages      : in out GNATdoc.Messages.Message_Container)
    is
+      Header_Section    : Section_Access;
       Leading_Section   : Section_Access;
       Trailing_Section  : Section_Access;
 
@@ -2385,6 +2387,24 @@ package body GNATdoc.Comments.Extractor is
                end if;
          end case;
 
+         if Raw_Section = null and Node.P_Is_Compilation_Unit_Root then
+            --  It is case of the package renaming as compilation unit
+            --
+            --  Side effect: two `<<LEADING>>` sections are created, one for
+            --  leading comments of the declation and another one for leading
+            --  section of the compilation unit's header.
+
+            Extract_Compilation_Unit_Documentation
+              (Node, Options, Sections, Header_Section, Leading_Section, True);
+
+            if not Leading_Section.Text.Is_Empty then
+               Raw_Section := Leading_Section;
+
+            else
+               Raw_Section := Header_Section;
+            end if;
+         end if;
+
          Parse_Raw_Section
            (GNATdoc.Utilities.Location (Node),
             Raw_Section,

source/gnatdoc-comments-helpers.adb

@@ -364,6 +364,7 @@ package body GNATdoc.Comments.Helpers is
                     | Ada_Null_Subp_Decl
                     | Ada_Number_Decl
                     | Ada_Object_Decl
+                    | Ada_Package_Body
                     | Ada_Package_Decl
                     | Ada_Package_Renaming_Decl
                     | Ada_Protected_Type_Decl
@@ -500,6 +501,7 @@ package body GNATdoc.Comments.Helpers is
                | Ada_Object_Decl
                | Ada_Package_Body
                | Ada_Package_Decl
+               | Ada_Package_Renaming_Decl
                | Ada_Param_Spec
                | Ada_Subtype_Decl
             =>

testsuite/als_helper/locations.json

@@ -131,6 +131,27 @@
     {"file": "exceptions_package.adb", "line": 8, "column": 16},
     //  reference of the exception
 
+    //  LAL 20250922: issue with package name resolution in the body doesn't allow to write test
+    // {"file": "packages.ads", "line": 5, "column": 9},
+    // //  specification of the package
+    // //  reference of the package from "end <>"
+    // {"file": "packages.adb", "line": 5, "column": 14},
+    // //  body of the package
+    // {"file": "packages.adb", "line": 9, "column": 7},
+    // //  reference of the package
+    // //  reference of the package from "end <>"
+    // {"file": "packages_package.adb", "line": 1, "column": 6},
+    // //  reference of the package in with clause
+    // {"file": "packages_package.adb", "line": 8, "column": 7},
+    // //  reference of the package in code
+
+    {"file": "packages_renaming.ads", "line": 7, "column": 9},
+    //  specification of the package renaming
+    {"file": "packages_package.adb", "line": 2, "column": 6},
+    //  reference of the package renaming from `with` clause
+    {"file": "packages_package.adb", "line": 2, "column": 6},
+    //  reference of the package renaming from code
+
     {"file": "synthetics.adb", "line": 11, "column": 15},
     //  reference of synthetic `"="` subprogram of `Implicit_Record`
     {"file": "synthetics.adb", "line": 15, "column": 15},

testsuite/als_helper/pkg1.adb renamed to testsuite/als_helper/packages.adb

@@ -2,11 +2,11 @@
 
 --  Description of the package body
 
-package body Pkg1 is
+package body Packages is
 
    procedure Dummy is
    begin
-      Pkg1.Dummy;
+      Packages.Dummy;
    end Dummy;
 
-end Pkg1;
+end Packages;

testsuite/als_helper/pkg1.ads renamed to testsuite/als_helper/packages.ads

@@ -2,8 +2,8 @@
 
 --  Description of the package specification
 
-package Pkg1 is
+package Packages is
 
    procedure Dummy;
 
-end Pkg1;
+end Packages;

testsuite/als_helper/packages_package.adb

@@ -0,0 +1,12 @@
+with Packages;
+with Packages_Renaming;
+
+package body Packages_Package is
+
+   procedure Dummy is
+   begin
+      Packages.Dummy;
+      Packages_Renaming.Dummy;
+   end Dummy;
+
+end Packages_Package;

testsuite/als_helper/packages_package.ads

@@ -0,0 +1,6 @@
+
+package Packages_Package is
+
+   procedure Dummy;
+
+end Packages_Package;

testsuite/als_helper/packages_renaming.ads

@@ -0,0 +1,7 @@
+--  Copyright header
+
+--  Description of the package renaming
+
+with Packages;
+
+package Packages_Renaming renames Packages;