Merge remote branch 'origin/master' into edge

(no-precommit-check no-tn-check)

Author: mergerepo

doc/settings.md

@@ -102,6 +102,25 @@ The value is a boolean.
     'renameInComments': false
 ```
 
+## displayMethodAncestryOnNavigation
+This setting controls the policy for displaying overriding and overridden
+subprograms on navigation requests such as `textDocument/definition`,
+`textDocument/declaration` or `textDocument/implementation`.
+
+The different policies are:
+
+  * `never`: Never list overridding and/or overridden suprograms.
+  * `usage_and_abstract_only`: List overridding and/or overridden suprograms
+     on dispatching calls and on abstract subprogram declarations.
+  * `definition_only`: List overridding and/or overridden suprograms on
+     declarations only.
+  * `always`: Always list overridding and/or overridden suprograms when
+     possible.
+
+```javascript
+    'displayMethodAncestryOnNavigation': 'always'
+```
+
 ## namedNotationThreshold
 This setting defines the number of parameters/components at which point named
 notation is used for subprogram/aggregate completion snippets.

gnat/gnat.adc

@@ -0,0 +1 @@
+pragma Restrictions (No_Obsolescent_Features);

gnat/lsp.gpr

@@ -94,6 +94,7 @@ project LSP is
 
    package Compiler is
       for Default_Switches ("Ada") use Ada_Switches;
+      for Local_Configuration_Pragmas use "gnat.adc";
    end Compiler;
 
    package Naming is

gnat/lsp_server.gpr

@@ -47,6 +47,7 @@ project LSP_Server is
       for Switches ("lsp-ada_driver.adb") use
         LSP.Ada_Switches & ("-gnateDVERSION=""" & VERSION & """");
       for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
+      for Local_Configuration_Pragmas use "gnat.adc";
    end Compiler;
 
    package Linker is

scripts/predefined_completion.py

@@ -79,7 +79,7 @@ def convert_to_ada(json_filename, output_file):
                 output += f"\n\n   Db{statement_counter} : constant String := "
                 statement_counter += 1
 
-            output += '"' + line.strip().replace('"', '""') + '" & ASCII.LF\n   & '
+            output += '"' + line.strip().replace('"', '""') + '"\n   & '
 
             line_counter += 1
 

source/ada/generated/lsp-predefined_completion-ada2012.ads

@@ -15,6 +15,7 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with Ada.Characters.Latin_1;
 with Ada.Characters.Wide_Wide_Latin_1;
 with Ada.Unchecked_Deallocation;
 
@@ -144,6 +145,10 @@ package body LSP.Ada_Documents is
 
       begin
          if J.Has_Element then
+            --  Update Line_Terminator of the document
+            Self.Line_Terminator := Self.Text.Slice
+              (J.Terminator_First_Marker, J.Terminator_Last_Marker);
+
             loop
                Self.Line_To_Marker.Append (J.First_Marker);
                Last_Line_Terminated := J.Has_Line_Terminator;
@@ -1143,6 +1148,20 @@ package body LSP.Ada_Documents is
       end loop;
    end Get_Symbols;
 
+   ---------------------
+   -- Line_Terminator --
+   ---------------------
+
+   function Line_Terminator (Self : Document'Class) return String is
+   begin
+      if Self.Line_Terminator.Is_Empty then
+         --  Document has no line terminator yet, return LF as most used
+         return (1 => Ada.Characters.Latin_1.LF);
+      else
+         return VSS.Strings.Conversions.To_UTF_8_String (Self.Line_Terminator);
+      end if;
+   end Line_Terminator;
+
    -----------------
    -- Get_Node_At --
    -----------------
@@ -1834,11 +1853,11 @@ package body LSP.Ada_Documents is
 
          if not Doc_Text.Is_Empty then
             Loc_Text.Append
-              (VSS.Strings.Conversions.To_Virtual_String
-                 (ASCII.LF & ASCII.LF));
-         end if;
+              (VSS.Strings.To_Virtual_String
+                 ((1 .. 2 => Ada.Characters.Wide_Wide_Latin_1.LF)));
 
-         Loc_Text.Append (Doc_Text);
+            Loc_Text.Append (Doc_Text);
+         end if;
 
          Item.documentation :=
            (Is_Set => True,

source/ada/lsp-ada_documents.adb

@@ -258,6 +258,9 @@ package LSP.Ada_Documents is
       return Langkit_Support.Slocs.Source_Location;
    --  Convert a Positon to a Source_Location
 
+   function Line_Terminator (Self : Document'Class) return String;
+   --  Return line terminator for the document
+
 private
 
    package Line_Marker_Vectors is new Ada.Containers.Vectors
@@ -300,6 +303,8 @@ private
       --  Cache of all defining name symbol of the document.
       Refresh_Symbol_Cache : Boolean := False;
       --  Symbol_Cache rebuild is required before.
+      Line_Terminator : VSS.Strings.Virtual_String;
+      --  Line terminator for the text, if known, "" otherwise
    end record;
 
    procedure Diff

source/ada/lsp-ada_documents.ads

@@ -17,6 +17,7 @@
 --
 --  This is driver to run LSP server for Ada language.
 
+with Ada.Characters.Latin_1;
 with Ada.Text_IO;
 with Ada.Exceptions;          use Ada.Exceptions;
 with GNAT.Command_Line;       use GNAT.Command_Line;
@@ -106,7 +107,8 @@ procedure LSP.Ada_Driver is
    procedure On_Uncaught_Exception (E : Exception_Occurrence) is
    begin
       Trace (Server_Trace,
-             "EXCEPTION: " & Exception_Name (E) & ASCII.LF &
+             "EXCEPTION: " & Exception_Name (E) &
+               Ada.Characters.Latin_1.LF &
                Symbolic_Traceback (E));
       Handler.Handle_Error;
    end On_Uncaught_Exception;
@@ -118,7 +120,8 @@ procedure LSP.Ada_Driver is
    procedure Die_On_Uncaught (E : Exception_Occurrence) is
    begin
       Trace (Server_Trace,
-             "EXCEPTION: " & Exception_Name (E) & ASCII.LF &
+             "EXCEPTION: " & Exception_Name (E) &
+               Ada.Characters.Latin_1.LF &
                Symbolic_Traceback (E));
       --  An exception occurred while fuzzing: make it fatal.
       GNAT.OS_Lib.OS_Exit (42);

source/ada/lsp-ada_driver.adb

@@ -270,13 +270,14 @@ package body LSP.Ada_Handlers.Refactor_Imports_Commands is
                Edit.span := LSP.Lal_Utils.To_Span (S);
                if Last then
                   Edit.newText := LSP.Types.To_LSP_String
-                    ("" & ASCII.LF
+                    (Document.Line_Terminator
                      & LSP.Types.To_UTF_8_String
                        ("with " & Self.With_Clause & ";"));
                else
                   Edit.newText := LSP.Types.To_LSP_String
                     (LSP.Types.To_UTF_8_String
-                       ("with " & Self.With_Clause & ";") & ASCII.LF);
+                       ("with " & Self.With_Clause & ";")
+                     & Document.Line_Terminator);
                end if;
 
                if Message_Handler.Versioned_Documents then