Merge branch 'topic/vadim/edge' into 'edge'

Merge master to edge

See merge request eng/ide/gnatdoc!167

Author: godunko

config/gnatdoc_config.ads

@@ -0,0 +1,18 @@
+--
+--  Copyright (C) 2025, AdaCore
+--
+--  SPDX-License-Identifier: GPL-3.0
+--
+
+--  This file is stub to build GNATdoc outside of the Alire environment. Alire
+--  will overwrite it during builds.
+
+pragma Restrictions (No_Elaboration_Code);
+pragma Style_Checks (Off);
+
+package Gnatdoc_Config is
+   pragma Pure;
+
+   Crate_Version : constant String := "%VERSION% (%DATE%)";
+
+end Gnatdoc_Config;

gnat/gnatdoc.gpr

@@ -25,7 +25,8 @@ project GNATdoc is
 
    for Object_Dir use "../.objs";
    for Source_Dirs use
-     ("../source/backend",
+     ("../config",
+      "../source/backend",
       "../source/backend/odf",
       "../source/backend/rst",
       "../source/backend/xml_templates",

source/backend/rst/gnatdoc-backend-rst.adb

@@ -346,7 +346,8 @@ package body GNATdoc.Backend.RST is
                end loop;
             end Union;
 
-            Types : Entity_Information_Sets.Set;
+            Types   : Entity_Information_Sets.Set;
+            Methods : Entity_Information_Sets.Set;
 
          begin
             Union (Types, Entity.Simple_Types);
@@ -388,17 +389,21 @@ package body GNATdoc.Backend.RST is
                   if Self.OOP_Mode
                     and then Item.Kind in Ada_Interface_Type | Ada_Tagged_Type
                   then
+                     Methods.Clear;
+
                      for Method of Item.Belongs_Subprograms loop
                         if not Is_Private_Entity
                           (GNATdoc.Entities.To_Entity (Method.Signature))
                         then
-                           Generate_Subprogram_Documentation
-                             ("    ",
-                              GNATdoc.Entities.To_Entity
-                                (Method.Signature).all,
-                              Entity.Qualified_Name);
+                           Methods.Insert
+                             (GNATdoc.Entities.To_Entity (Method.Signature));
                         end if;
                      end loop;
+
+                     for Method of Methods loop
+                        Generate_Subprogram_Documentation
+                          ("    ", Method.all, Entity.Qualified_Name);
+                     end loop;
                   end if;
 
                   File.New_Line (Success);

source/gnatdoc/gnatdoc-command_line.adb

@@ -21,7 +21,7 @@ with VSS.Strings.Conversions;
 
 with GNATdoc.Comments.Options;
 with GNATdoc.Options;
-with GNATdoc.Version;
+with Gnatdoc_Config;
 
 with GPR2.Options;
 with GPR2.Project.Registry.Exchange;
@@ -209,7 +209,8 @@ package body GNATdoc.Command_Line is
             VSS.Command_Line.Report_Error
               (Template.Format
                  (VSS.Strings.Formatters.Strings.Image
-                      (GNATdoc.Version.Version_String)));
+                    (VSS.Strings.Conversions.To_Virtual_String
+                       (Gnatdoc_Config.Crate_Version))));
          end;
       end if;