Merge branch 'topic/eng/ide/ada_language_server#1451' into 'master'

Fix removal of old logs

See merge request eng/ide/ada_language_server!1714

(cherry picked from commit 5b44580)

e0e918d Fix removal of old logs

Co-authored-by: Anthony Leonardo Gracio <leonardo@adacore.com>

Author: AnthonyLeonardoGracio

source/ada/lsp-ada_driver.adb

@@ -121,6 +121,48 @@ procedure LSP.Ada_Driver is
    procedure Register_Commands;
    --  Register all known commands
 
+   procedure Remove_Old_Log_files
+     (Dir                 : GNATCOLL.VFS.Virtual_File;
+      Prefix              : String;
+      Max_Nb_Of_Log_Files : Integer);
+   --  Remove old log files with the given prefix in the given log
+   --  directory when it exceeds the number specified in Max_Nb_Of_Log_Files.
+
+      --------------------------
+      -- Remove_Old_Log_files --
+      --------------------------
+
+   procedure Remove_Old_Log_files
+     (Dir                 : GNATCOLL.VFS.Virtual_File;
+      Prefix              : String;
+      Max_Nb_Of_Log_Files : Integer)
+   is
+      Files   : File_Array_Access := Read_Dir (Dir, Files_Only);
+      Success : Boolean;
+      Counted : Natural := 0;
+      Traces_File_Suffix : constant String := ".cfg";
+   begin
+      Sort (Files.all);
+
+      --  Browse the log files in reverse timestamp order
+      for J in reverse Files'Range loop
+         if GNATCOLL.Utils.Starts_With (+Files (J).Base_Name, Prefix)
+           and then not GNATCOLL.Utils.Ends_With
+             (+Files (J).Base_Name, Traces_File_Suffix)
+         then
+            Counted := Counted + 1;
+
+            --  When we've counted all the files we wanted to keep, delete
+            --  the older ones.
+            if Counted > Max_Nb_Of_Log_Files then
+               Delete (Files (J), Success);
+            end if;
+         end if;
+      end loop;
+
+      Unchecked_Free (Files);
+   end Remove_Old_Log_files;
+
    -----------------------
    -- Register_Commands --
    -----------------------
@@ -317,6 +359,9 @@ procedure LSP.Ada_Driver is
       Long_Name   => "version",
       Description => "Display the program version");
 
+   Ada_Log_File_Prefix    : constant String := "ada_ls";
+   GPR_Log_File_Prefix    : constant String := "gpr_ls";
+
    Config_File            : Virtual_File;
 
    Memory_Monitor_Enabled : Boolean;
@@ -384,8 +429,8 @@ begin
          Traces_File := Create_From_Dir
            (Dir       => ALS_Dir,
             Base_Name =>
-              (if VSS.Command_Line.Is_Specified (Language_GPR_Option) then
-                    "gpr_ls" else "ada_ls") & "_traces.cfg");
+              +(if VSS.Command_Line.Is_Specified (Language_GPR_Option) then
+               GPR_Log_File_Prefix else Ada_Log_File_Prefix) & "_traces.cfg");
 
          --  No default traces file found: create one if we can
          if not Traces_File.Is_Regular_File and then ALS_Dir.Is_Writable then
@@ -394,7 +439,7 @@ begin
                Default_Traces_File_Contents : constant String :=
                  ">"
                  & (if VSS.Command_Line.Is_Specified (Language_GPR_Option)
-                    then "gpr_ls" else "ada_ls")
+                    then GPR_Log_File_Prefix else Ada_Log_File_Prefix)
                  & "_log.$T.log:buffer_size=0:buffer_size=0"
                  & Ada.Characters.Latin_1.LF
                  & "ALS.MAIN=yes" & Ada.Characters.Latin_1.LF
@@ -616,8 +661,16 @@ begin
    end if;
 
    Server.Finalize;
+
    if Clean_ALS_Dir then
-      Ada_Handler.Clean_Logs (ALS_Dir);
+      --  Remove the logs produced for the GPR language if the '--language-gpr'
+      --  option has been specified. Otherwise remove the Ada language logs.
+      Remove_Old_Log_files
+        (Dir                 => ALS_Dir,
+         Prefix              =>
+           (if VSS.Command_Line.Is_Specified (Language_GPR_Option) then
+            GPR_Log_File_Prefix else Ada_Log_File_Prefix),
+         Max_Nb_Of_Log_Files => Ada_Handler.Get_Configuration.Log_Threshold);
    end if;
 
    --  Clean secondary stack up

source/ada/lsp-ada_handlers-project_loading.adb

@@ -398,13 +398,7 @@ package body LSP.Ada_Handlers.Project_Loading is
          --  Log the messages
          Self.Tracer.Trace ("GPR2 Log Messages:");
          for Msg of Update_Log loop
-            declare
-               Location : constant String :=
-                 Msg.Sloc.Format (Full_Path_Name => True);
-               Message : constant String := Msg.Message;
-            begin
-               Self.Tracer.Trace (Location & " " & Message);
-            end;
+            Self.Tracer.Trace (Msg.Format);
          end loop;
 
          --  Retrieve the GPR2 error/warning messages right after loading the

source/ada/lsp-ada_handlers.adb

@@ -21,7 +21,6 @@ with Ada.Strings.UTF_Encoding;
 with Ada.Unchecked_Deallocation;
 
 with GNAT.OS_Lib;
-with GNATCOLL.Utils;
 
 with VSS.Characters.Latin;
 with VSS.Strings.Formatters.Integers;
@@ -220,36 +219,6 @@ package body LSP.Ada_Handlers is
       end if;
    end Clean_Diagnostics;
 
-   ----------------
-   -- Clean_Logs --
-   ----------------
-
-   procedure Clean_Logs
-     (Self : access Message_Handler'Class;
-      Dir  : GNATCOLL.VFS.Virtual_File)
-   is
-      use GNATCOLL.VFS;
-      Files : File_Array_Access := Read_Dir (Dir, Files_Only);
-      Dummy : Boolean;
-      Cpt   : Integer := 0;
-   begin
-      Sort (Files.all);
-      --  Browse the log files in reverse timestamp order
-      for F of reverse Files.all loop
-         --  Filter out files like traces.cfg
-         if GNATCOLL.Utils.Ends_With (+F.Base_Name, ".log")
-           or else GNATCOLL.Utils.Ends_With (+F.Base_Name, ".txt")
-         then
-            Cpt := Cpt + 1;
-            --  Delete the old logs
-            if Cpt > Self.Configuration.Log_Threshold then
-               Delete (F, Dummy);
-            end if;
-         end if;
-      end loop;
-      Unchecked_Free (Files);
-   end Clean_Logs;
-
    -----------------------
    -- Contexts_For_File --
    -----------------------

source/ada/lsp-ada_handlers.ads

@@ -132,15 +132,6 @@ package LSP.Ada_Handlers is
    --  If the document is not opened, then it returns a
    --  OptionalVersionedTextDocumentIdentifier with a null version.
 
-   -----------------
-   -- Log Manager --
-   -----------------
-
-   procedure Clean_Logs
-     (Self : access Message_Handler'Class;
-      Dir  : GNATCOLL.VFS.Virtual_File);
-   --  Remove the oldest logs in Dir
-
 private
    type Project_Stamp is mod 2**32;