Merge remote branch 'origin/master' into edge

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

Author: mergerepo

source/ada/lsp-ada_documents.adb

@@ -1959,6 +1959,17 @@ package body LSP.Ada_Documents is
       Recompute_Indexes (Self);
    end Initialize;
 
+   -------------
+   -- Cleanup --
+   -------------
+
+   procedure Cleanup (Self : in out Document) is
+   begin
+      for Source of Self.Diagnostic_Sources loop
+         LSP.Diagnostic_Sources.Unchecked_Free (Source);
+      end loop;
+   end Cleanup;
+
    ------------------------
    -- Reset_Symbol_Cache --
    ------------------------

source/ada/lsp-ada_documents.ads

@@ -59,6 +59,9 @@ package LSP.Ada_Documents is
    --  Create a new document from a TextDocumentItem. Use Diagnostic as
    --  project status diagnostic source.
 
+   procedure Cleanup (Self : in out Document);
+   --  Free all the data associated to this document.
+
    -----------------------
    -- Contents handling --
    -----------------------

source/ada/lsp-ada_handlers.adb

@@ -174,9 +174,6 @@ package body LSP.Ada_Handlers is
    procedure Index_Files (Self : access Message_Handler);
    --  Index all loaded files in each context. Emit progresormation.
 
-   procedure Unchecked_Free is new Ada.Unchecked_Deallocation
-     (LSP.Ada_Documents.Document, Internal_Document_Access);
-
    procedure Release_Contexts_And_Project_Info (Self : access Message_Handler);
    --  Release the memory associated to project information in Self
 
@@ -528,20 +525,24 @@ package body LSP.Ada_Handlers is
    -- Cleanup --
    -------------
 
-   procedure Cleanup (Self : access Message_Handler) is
+   procedure Cleanup (Self : access Message_Handler)
+   is
    begin
       if Self.File_Monitor.Assigned then
          Self.File_Monitor.Stop_Monitoring_Directories;
       end if;
 
       --  Cleanup documents
       for Document of Self.Open_Documents loop
-         Unchecked_Free (Document);
+         Free (Document);
       end loop;
       Self.Open_Documents.Clear;
 
       --  Cleanup contexts, project and environment
       Self.Release_Contexts_And_Project_Info;
+
+      --  Free the file monitor
+      LSP.File_Monitors.Unchecked_Free (Self.File_Monitor);
    end Cleanup;
 
    -----------------------
@@ -2615,7 +2616,7 @@ package body LSP.Ada_Handlers is
             Context.Flush_Document (File);
          end loop;
 
-         Unchecked_Free (Document);
+         Free (Document);
 
       else
          --  We have received a didCloseTextDocument but the document was
@@ -3748,7 +3749,7 @@ package body LSP.Ada_Handlers is
               (Document.all, Context.all, Pattern,
                Canceled.Has_Been_Canceled'Access, Result.result);
 
-            Unchecked_Free (Internal_Document_Access (Document));
+            Free (Internal_Document_Access (Document));
          end;
       else
          Self.Get_Symbols
@@ -5969,6 +5970,18 @@ package body LSP.Ada_Handlers is
       end if;
    end Publish_Diagnostics;
 
+   ----------
+   -- Free --
+   ----------
+
+   procedure Free (Self : in out Internal_Document_Access) is
+      procedure Unchecked_Free is new Ada.Unchecked_Deallocation
+        (LSP.Ada_Documents.Document, Internal_Document_Access);
+   begin
+      Self.Cleanup;
+      Unchecked_Free (Self);
+   end Free;
+
    ------------------
    -- Show_Message --
    ------------------

source/ada/lsp-ada_handlers.ads

@@ -113,6 +113,9 @@ private
 
    type Internal_Document_Access is access all LSP.Ada_Documents.Document;
 
+   procedure Free (Self : in out Internal_Document_Access);
+   --  Free all the data for the given document.
+
    --  Container for documents indexed by URI
    package Document_Maps is new Ada.Containers.Hashed_Maps
      (Key_Type        => GNATCOLL.VFS.Virtual_File,

source/ada/lsp-diagnostic_sources.ads

@@ -15,6 +15,7 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with Ada.Unchecked_Deallocation;
 with LSP.Messages;
 limited with LSP.Ada_Contexts;
 
@@ -38,4 +39,7 @@ package LSP.Diagnostic_Sources is
    --  Return True if diagnostic changed since last call to Get_Diagnostic or
    --  if Get_Diagnostic was never called and any diagnostic presents.
 
+   procedure Unchecked_Free is new Ada.Unchecked_Deallocation
+     (Diagnostic_Source'Class, Diagnostic_Source_Access);
+
 end LSP.Diagnostic_Sources;

source/server/lsp-file_monitors.ads

@@ -18,6 +18,7 @@
 --  This package provides a file monitoring service interface.
 
 with GNATCOLL.VFS;
+with Ada.Unchecked_Deallocation;
 
 package LSP.File_Monitors is
 
@@ -43,4 +44,7 @@ package LSP.File_Monitors is
    --  Stop filesystem monitoring. This is a no-op if no monitoring is
    --  ongoing.
 
+   procedure Unchecked_Free is new Ada.Unchecked_Deallocation
+     (File_Monitor'Class, File_Monitor_Access);
+
 end LSP.File_Monitors;