Code refactoring...

... to share code of Text_Document between Ada and GPR servers.
AdaCore · Oct 2, 2023 · af3ed75 · af3ed75
1 parent 9c25a9d
commit af3ed75
Show file tree

Hide file tree

Showing 15 changed files with 1,350 additions and 1,613 deletions.
diff --git a/source/ada/lsp-ada_completions-generic_assoc.adb b/source/ada/lsp-ada_completions-generic_assoc.adb
@@ -405,13 +405,12 @@ package body LSP.Ada_Completions.Generic_Assoc is
       end if;
 
       Prefix_Span :=
-        Self.Document.To_LSP_Range
+        Self.Document.To_A_Range
           (Langkit_Support.Slocs.Make_Range
              (Langkit_Support.Slocs.Start_Sloc
                 (Get_Prefix_Node (Elem_Node, Column => Column).Sloc_Range),
               Sloc));
-      Prefix := Self.Document.Get_Text_At
-        (Prefix_Span.start, Prefix_Span.an_end);
+      Prefix := Self.Document.Slice (Prefix_Span);
 
       Parameters := Get_Parameters (Elem_Node, Prefixed);
       Using_Name := Has_Designator (Unnamed_Params);

diff --git a/source/ada/lsp-ada_documents-lal_diagnostics.adb b/source/ada/lsp-ada_documents-lal_diagnostics.adb
@@ -40,11 +40,12 @@ package body LSP.Ada_Documents.LAL_Diagnostics is
       Self.Errors := Self.Get_Diagnostics (Context);
 
       for J in Self.Errors.List'Range loop
-         Item.a_range := Self.Document.To_LSP_Range
-           (Self.Errors.List (J).Sloc_Range);
+         Item.a_range :=
+           Self.Document.To_A_Range (Self.Errors.List (J).Sloc_Range);
 
-         Item.message := VSS.Strings.Conversions.To_Virtual_String
-           (Self.Errors.List (J).Message);
+         Item.message :=
+           VSS.Strings.Conversions.To_Virtual_String
+             (Self.Errors.List (J).Message);
 
          Errors.Append (Item);
       end loop;