Merge remote branch 'origin/master' into edge

Author: automatic-merge

source/ada/lsp-ada_configurations.adb

@@ -205,6 +205,14 @@ package body LSP.Ada_Configurations is
            and then JSON (Index).Kind = Start_Object
          then
             Parse_Variables (Index);
+            Sort_Variables (1, Variables_Names.Length);
+
+            Reload := Reload or else
+              Variables_Names /= Self.Variables_Names or else
+              Variables_Values /= Self.Variables_Values;
+
+            Self.Variables_Names := Variables_Names;
+            Self.Variables_Values := Variables_Values;
 
          elsif Name = "defaultCharset"
            and then JSON (Index).Kind = String_Value
@@ -288,15 +296,6 @@ package body LSP.Ada_Configurations is
 
          Skip_Value (JSON, Index);
       end loop;
-
-      Sort_Variables (1, Variables_Names.Length);
-
-      Reload := Reload or else
-        Variables_Names /= Self.Variables_Names or else
-        Variables_Values /= Self.Variables_Values;
-
-      Self.Variables_Names := Variables_Names;
-      Self.Variables_Values := Variables_Values;
    end Parse_Ada;
 
    --------------------

source/ada/lsp-ada_driver.adb

@@ -381,7 +381,7 @@ begin
 
    Server.Finalize;
    if Clean_ALS_Dir then
-      pragma Assert (Clean_ALS_Dir);
+      Ada_Handler.Clean_Logs (ALS_Dir);
    end if;
 
    --  Clean secondary stack up

source/ada/lsp-ada_handlers.adb

@@ -23,6 +23,7 @@ with Ada.Unchecked_Deallocation;
 
 with GNAT.OS_Lib;
 with GNATCOLL.Traces;
+with GNATCOLL.Utils;
 
 with VSS.Characters.Latin;
 with VSS.Strings.Formatters.Integers;
@@ -216,6 +217,34 @@ 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") 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

@@ -87,9 +87,9 @@ package LSP.Ada_Handlers is
       return LSP.Structures.ProgressToken;
    --  Return an unique token for indicating progress
 
-   ----------------------------
-   --  Open Document Manger  --
-   ----------------------------
+   -----------------------------
+   --  Open Document Manager  --
+   -----------------------------
 
    function Get_Open_Document
      (Self  : in out Message_Handler;
@@ -125,6 +125,15 @@ 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 Load_Project_Status is