File name formatters.

godunko · reznikmm · commit a1c04c603a24 · 2023-10-02T13:05:42.000+03:00
diff --git a/source/ada/lsp-ada_documents.adb b/source/ada/lsp-ada_documents.adb
@@ -49,6 +49,7 @@ with LSP.Ada_Documentation;
 with LSP.Ada_Documents.LAL_Diagnostics;
 with LSP.Ada_Id_Iterators;
 with LSP.Enumerations;
+with LSP.Formatters.File_Names;
 with LSP.Predicates;
 with LSP.Utils;
 with LSP.Structures.LSPAny_Vectors;
@@ -1115,9 +1116,7 @@ package body LSP.Ada_Documents is
             for Error of PP_Messages loop
                Messages.Append
                  (Template.Format
-                    (VSS.Strings.Formatters.Strings.Image
-                         (VSS.Strings.Conversions.To_Virtual_String
-                              (File.Display_Base_Name)),
+                    (LSP.Formatters.File_Names.Image (File),
                      VSS.Strings.Formatters.Integers.Image (Error.Sloc.Line),
                      VSS.Strings.Formatters.Integers.Image (Error.Sloc.Col),
                      VSS.Strings.Formatters.Strings.Image
diff --git a/source/ada/lsp-formatters-file_names.adb b/source/ada/lsp-formatters-file_names.adb
@@ -0,0 +1,50 @@
+------------------------------------------------------------------------------
+--                         Language Server Protocol                         --
+--                                                                          --
+--                     Copyright (C) 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- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  This software is distributed in the hope  that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
+-- License for  more details.  You should have  received  a copy of the GNU --
+-- General  Public  License  distributed  with  this  software;   see  file --
+-- COPYING3.  If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license.                                                          --
+------------------------------------------------------------------------------
+
+with VSS.Strings.Conversions;
+
+package body LSP.Formatters.File_Names is
+
+   -----------
+   -- Image --
+   -----------
+
+   function Image (Item : GNATCOLL.VFS.Virtual_File) return Formatter is
+   begin
+      return
+        (VSS.Strings.Formatters.Strings.Image
+           (VSS.Strings.Conversions.To_Virtual_String
+                (Item.Display_Base_Name)) with null record);
+   end Image;
+
+   -----------
+   -- Image --
+   -----------
+
+   function Image
+     (Name : VSS.Strings.Virtual_String;
+      Item : GNATCOLL.VFS.Virtual_File) return Formatter is
+   begin
+      return
+        (VSS.Strings.Formatters.Strings.Image
+           (Name,
+            VSS.Strings.Conversions.To_Virtual_String
+              (Item.Display_Base_Name))
+           with null record);
+   end Image;
+
+end LSP.Formatters.File_Names;
diff --git a/source/ada/lsp-formatters-file_names.ads b/source/ada/lsp-formatters-file_names.ads
@@ -0,0 +1,41 @@
+------------------------------------------------------------------------------
+--                         Language Server Protocol                         --
+--                                                                          --
+--                     Copyright (C) 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- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  This software is distributed in the hope  that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
+-- License for  more details.  You should have  received  a copy of the GNU --
+-- General  Public  License  distributed  with  this  software;   see  file --
+-- COPYING3.  If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license.                                                          --
+------------------------------------------------------------------------------
+
+--  Formatter to include base file names of Virtual_Files into the text.
+
+with GNATCOLL.VFS;
+
+with VSS.Strings.Formatters;
+private with VSS.Strings.Formatters.Strings;
+
+package LSP.Formatters.File_Names is
+
+   type Formatter is
+     new VSS.Strings.Formatters.Abstract_Formatter with private;
+
+   function Image (Item : GNATCOLL.VFS.Virtual_File) return Formatter;
+
+   function Image
+     (Name : VSS.Strings.Virtual_String;
+      Item : GNATCOLL.VFS.Virtual_File) return Formatter;
+
+private
+
+   type Formatter is
+     new VSS.Strings.Formatters.Strings.Formatter with null record;
+
+end LSP.Formatters.File_Names;
diff --git a/source/ada/lsp-formatters.ads b/source/ada/lsp-formatters.ads
@@ -0,0 +1,22 @@
+------------------------------------------------------------------------------
+--                         Language Server Protocol                         --
+--                                                                          --
+--                     Copyright (C) 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- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  This software is distributed in the hope  that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
+-- License for  more details.  You should have  received  a copy of the GNU --
+-- General  Public  License  distributed  with  this  software;   see  file --
+-- COPYING3.  If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license.                                                          --
+------------------------------------------------------------------------------
+
+package LSP.Formatters is
+
+   pragma Pure;
+
+end LSP.Formatters;
diff --git a/source/ada/lsp-utils.adb b/source/ada/lsp-utils.adb
@@ -31,14 +31,14 @@ with Pp.Actions;
 with VSS.Strings.Character_Iterators;
 with VSS.Strings.Conversions;
 with VSS.Strings.Formatters.Generic_Modulars;
-with VSS.Strings.Formatters.Strings;
 with VSS.Strings.Templates;
 with VSS.String_Vectors;
 with VSS.Unicode;
 with Laltools.Common;
 
 with LSP.Ada_Documents;
 with LSP.Constants;
+with LSP.Formatters.File_Names;
 with URIs;
 
 package body LSP.Utils is
@@ -488,9 +488,7 @@ package body LSP.Utils is
    begin
       return
         Template.Format
-          (VSS.Strings.Formatters.Strings.Image
-             (VSS.Strings.Conversions.To_Virtual_String
-                (File.Display_Base_Name)),
+          (LSP.Formatters.File_Names.Image (File),
            Line_Number_Formatters.Image (Node.Sloc_Range.Start_Line),
            Column_Number_Formatters.Image (Node.Sloc_Range.Start_Column));
    end Node_Location_Image;
