Merge branch 'mr/1584' into 'master'

Monitor the filesystem for changes in all source dirs

Closes #1584

See merge request eng/ide/ada_language_server!1891

Author: setton

source/ada/lsp-ada_context_sets.adb

@@ -164,16 +164,12 @@ package body LSP.Ada_Context_Sets is
    ----------------------------
 
    function All_Source_Directories
-     (Self                     : Context_Set'Class;
-      Include_Externally_Built : Boolean := False)
-      return GNATCOLL.VFS.File_Array
+     (Self : Context_Set'Class) return GNATCOLL.VFS.File_Array
    is
       Consolidated_Set : LSP.Ada_File_Sets.File_Sets.Set;
    begin
       for C of Self.Contexts loop
-         Consolidated_Set.Union
-           (C.List_Source_Directories
-              (Include_Externally_Built => Include_Externally_Built));
+         Consolidated_Set.Union (C.List_Source_Directories);
       end loop;
 
       declare

source/ada/lsp-ada_context_sets.ads

@@ -58,9 +58,7 @@ package LSP.Ada_Context_Sets is
    --  Number of files in all contexts
 
    function All_Source_Directories
-     (Self                     : Context_Set'Class;
-      Include_Externally_Built : Boolean := False)
-      return GNATCOLL.VFS.File_Array;
+     (Self : Context_Set'Class) return GNATCOLL.VFS.File_Array;
    --  Return the list of all source directories for writable projects in the
    --  context, including externally built projects' source directories when
    --  Include_Externally_Built is set to True.

source/ada/lsp-ada_contexts.adb

@@ -158,22 +158,6 @@ package body LSP.Ada_Contexts is
       return Source_Units;
    end Analysis_Units;
 
-   -----------------------------
-   -- List_Source_Directories --
-   -----------------------------
-
-   function List_Source_Directories
-     (Self                     : Context;
-      Include_Externally_Built : Boolean := False)
-      return LSP.Ada_File_Sets.File_Sets.Set is
-   begin
-      if Include_Externally_Built then
-         return Self.Source_Dirs.Union (Self.External_Source_Dirs);
-      else
-         return Self.Source_Dirs;
-      end if;
-   end List_Source_Directories;
-
    ----------------------------
    -- List_Source_Externsion --
    ----------------------------
@@ -685,15 +669,9 @@ package body LSP.Ada_Contexts is
 
          procedure Add_Dirs_From_View (View : GPR2.Project.View.Object) is
          begin
-            if View.Is_Externally_Built then
-               for Dir of View.Source_Directories loop
-                  Self.External_Source_Dirs.Include (Dir.Virtual_File);
-               end loop;
-            else
-               for Dir of View.Source_Directories loop
-                  Self.Source_Dirs.Include (Dir.Virtual_File);
-               end loop;
-            end if;
+            for Dir of View.Source_Directories loop
+               Self.Source_Dirs.Include (Dir.Virtual_File);
+            end loop;
          end Add_Dirs_From_View;
 
       begin
@@ -702,7 +680,6 @@ package body LSP.Ada_Contexts is
          Process_Closure (Root, Add_Sources_From_View'Access);
 
          Self.Source_Dirs.Clear;
-         Self.External_Source_Dirs.Clear;
 
          Process_Closure (Root, Add_Dirs_From_View'Access);
 

source/ada/lsp-ada_contexts.ads

@@ -205,8 +205,7 @@ package LSP.Ada_Contexts is
    --  Return the analysis units for all Ada sources known to this context
 
    function List_Source_Directories
-     (Self : Context; Include_Externally_Built : Boolean := False)
-      return LSP.Ada_File_Sets.File_Sets.Set;
+      (Self : Context) return LSP.Ada_File_Sets.File_Sets.Set;
    --  List the source directories, including externally built projects' source
    --  directories when Include_Externally_Built is set to True.
 
@@ -325,12 +324,9 @@ private
       --  Cache for the list of Ada source files in the loaded project tree.
 
       Source_Dirs    : LSP.Ada_File_Sets.File_Sets.Set;
-      --  All the source dirs in the loaded project, not including
+      --  All the source dirs in the loaded project, including
       --  the externally built projects
 
-      External_Source_Dirs : LSP.Ada_File_Sets.File_Sets.Set;
-      --  All the source dirs coming from externally built projects
-
       Extension_Set : LSP.Ada_File_Sets.Extension_Sets.Set;
       --  All the ada extensions valid for the current project
 
@@ -359,6 +355,10 @@ private
      return LSP.Ada_File_Sets.File_Sets.Set_Iterator_Interfaces
        .Reversible_Iterator'Class is (Self.Source_Files.Iterate);
 
+   function List_Source_Directories
+     (Self : Context) return LSP.Ada_File_Sets.File_Sets.Set
+   is (Self.Source_Dirs);
+
    function File_Count (Self : Context) return Natural
    is (Self.Source_Files.Length);
 

source/ada/lsp-ada_handlers-source_dirs_commands.adb

@@ -56,8 +56,7 @@ package body LSP.Ada_Handlers.Source_Dirs_Commands is
       end Append;
 
       Source_Dirs : constant GNATCOLL.VFS.File_Array :=
-        Handler.Contexts.All_Source_Directories
-          (Include_Externally_Built => True);
+        Handler.Contexts.All_Source_Directories;
    begin
       Response := (Is_Null => False, Value => <>);
       Append ((Kind => VSS.JSON.Streams.Start_Array));