Merge branch 'topic/gnatdoc' into 'master'

Remove use of LAL fallback to extract documentation

See merge request eng/ide/ada_language_server!1180

Author: godunko

source/ada/lsp-ada_driver.adb

@@ -115,6 +115,8 @@ procedure LSP.Ada_Driver is
    begin
       Trace (Server_Trace,
              "EXCEPTION: " & Exception_Name (E) &
+               Ada.Characters.Latin_1.LF &
+               "INFORMATION: " & Exception_Information (E) &
                Ada.Characters.Latin_1.LF &
                Symbolic_Traceback (E));
       Ada_Handler.Handle_Error;
@@ -128,6 +130,8 @@ procedure LSP.Ada_Driver is
    begin
       Trace (Server_Trace,
              "EXCEPTION: " & Exception_Name (E) &
+               Ada.Characters.Latin_1.LF &
+               "INFORMATION: " & Exception_Information (E) &
                Ada.Characters.Latin_1.LF &
                Symbolic_Traceback (E));
       --  An exception occurred while fuzzing: make it fatal.

source/ada/lsp-lal_utils.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2023, 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- --
@@ -31,7 +31,6 @@ with VSS.Unicode;
 with Langkit_Support;
 with Langkit_Support.Symbols; use Langkit_Support.Symbols;
 with Libadalang.Common;       use Libadalang.Common;
-with Libadalang.Doc_Utils;
 with Libadalang.Sources;
 
 with Laltools.Call_Hierarchy;
@@ -805,6 +804,8 @@ package body LSP.Lal_Utils is
       Doc_Text  : out VSS.Strings.Virtual_String;
       Decl_Text : out VSS.Strings.Virtual_String)
    is
+      pragma Unreferenced (Trace);
+
       Options : constant
         GNATdoc.Comments.Options.Extractor_Options :=
           (Style    => Style,
@@ -833,27 +834,6 @@ package body LSP.Lal_Utils is
          Decl_Text := Get_Decl_Text (BD);
       end if;
 
-      --  Obtain documentation via the old engine when GNATdoc fails to extract
-      --  the comments.
-      if Doc_Text.Is_Empty then
-
-         --  Property_Errors can occur when calling
-         --  Libadalang.Doc_Utils.Get_Documentation on unsupported
-         --  docstrings, so add an exception handler to catch them and recover.
-         begin
-            Doc_Text :=
-              VSS.Strings.To_Virtual_String
-                (Libadalang.Doc_Utils.Get_Documentation
-                   (BD).Doc.To_String);
-         exception
-            when Libadalang.Common.Property_Error =>
-               Trace.Trace
-                 ("Failed to compute documentation with LAL"
-                  & "(unsupported docstring) for: " & BD.Image);
-               Doc_Text := VSS.Strings.Empty_Virtual_String;
-         end;
-      end if;
-
       Loc_Text := LSP.Lal_Utils.Node_Location_Image (BD);
    end Get_Tooltip_Text;
 

testsuite/ada_lsp/T713-012.completion.generic_package/test.json

@@ -276,7 +276,7 @@
                   "label": "Params of G",
                   "kind": 15,
                   "detail": "generic\n    type Elt_Type(<>) is limited private;\n    type Elt_Ptr is access all Elt_Type;\npackage G is\n    type T(Length: Natural) is private;\n    type T_Ptr is access all T;\nprivate\n    type Elt_Array is array(Positive range <>) of Elt_Ptr;\n    type T(Length: Natural) is\n\trecord\n\t    Elts: Elt_Array(1..Length);\n\tend record;\nend G;",
-                  "documentation": "at g.ads (3:1)\n\nSource:",
+                  "documentation": "at g.ads (3:1)\n\nSource:\n\n@formal Elt_Type\n@formal Elt_Ptr",
                   "sortText": "+0",
                   "insertText": "${1:Elt_Type : type Elt_Type(<>) is limited private;}, ${2:Elt_Ptr : type Elt_Ptr is access all Elt_Type;})$0",
                   "insertTextFormat": 2,
@@ -517,7 +517,7 @@
                   "label": "Params of G",
                   "kind": 15,
                   "detail": "generic\n    type Elt_Type(<>) is limited private;\n    type Elt_Ptr is access all Elt_Type;\npackage G is\n    type T(Length: Natural) is private;\n    type T_Ptr is access all T;\nprivate\n    type Elt_Array is array(Positive range <>) of Elt_Ptr;\n    type T(Length: Natural) is\n\trecord\n\t    Elts: Elt_Array(1..Length);\n\tend record;\nend G;",
-                  "documentation": "at g.ads (3:1)\n\nSource:",
+                  "documentation": "at g.ads (3:1)\n\nSource:\n\n@formal Elt_Type\n@formal Elt_Ptr",
                   "sortText": "+0",
                   "insertText": " Elt_Ptr => ${2:type Elt_Ptr is access all Elt_Type;})$0",
                   "insertTextFormat": 2,