Merge branch 'topic/W125-018.remove_is_ada_file' into 'edge'

W125-018: Remove Is_Ada_File checks

See merge request eng/ide/ada_language_server!1129

Author: AdrienBoulanger

source/ada/lsp-ada_context_sets.ads

@@ -65,7 +65,7 @@ package LSP.Ada_Context_Sets is
    --  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.
-   --  Each dirctory is present only once in the resulting array.
+   --  Each directory is present only once in the resulting array.
 
    procedure Cleanup (Self : in out Context_Set'Class);
    --  Free memory referenced by Self

source/ada/lsp-ada_contexts.adb

@@ -265,10 +265,6 @@ package body LSP.Ada_Contexts is
       File    : GNATCOLL.VFS.Virtual_File;
       Reparse : Boolean := False) return Libadalang.Analysis.Analysis_Unit is
    begin
-      if not Is_Ada_File (Self.Tree.all, File) then
-         return Libadalang.Analysis.No_Analysis_Unit;
-      end if;
-
       return Self.LAL_Context.Get_From_File
         (File.Display_Full_Name,
          Charset => Self.Get_Charset,
@@ -310,6 +306,16 @@ package body LSP.Ada_Contexts is
       end if;
    end List_Source_Directories;
 
+   ----------------------------
+   -- List_Source_Externsion --
+   ----------------------------
+
+   function List_Source_Extensions
+     (Self : Context) return LSP.Ada_File_Sets.Extension_Sets.Set is
+   begin
+      return Self.Extension_Set;
+   end List_Source_Extensions;
+
    -------------------------
    -- Find_All_References --
    -------------------------
@@ -744,6 +750,32 @@ package body LSP.Ada_Contexts is
          loop
             Self.External_Source_Dirs.Include (Dir.Virtual_File);
          end loop;
+
+         Self.Extension_Set.Clear;
+
+         for C in Tree.Iterate
+           (Kind => (GPR2.Project.I_Runtime       => True,
+                     GPR2.Project.I_Configuration => False,
+                     others                       => True))
+         loop
+            declare
+               View                : constant GPR2.Project.View.Object :=
+                 GPR2.Project.Tree.Element (C);
+               Spec_Suffix         : constant String :=
+                 View.Spec_Suffix (GPR2.Ada_Language).Value.Text;
+               Body_Suffix         : constant String :=
+                 View.Body_Suffix (GPR2.Ada_Language).Value.Text;
+               Separate_Suffix     : constant String :=
+                 View.Separate_Suffix.Value.Text;
+            begin
+               Self.Extension_Set.Include
+                 (VSS.Strings.Conversions.To_Virtual_String (Spec_Suffix));
+               Self.Extension_Set.Include
+                 (VSS.Strings.Conversions.To_Virtual_String (Body_Suffix));
+               Self.Extension_Set.Include
+                 (VSS.Strings.Conversions.To_Virtual_String (Separate_Suffix));
+            end;
+         end loop;
       end Update_Source_Files;
 
       --------------------------

source/ada/lsp-ada_contexts.ads

@@ -234,6 +234,10 @@ package LSP.Ada_Contexts is
    --  List the source directories, including externally built projects' source
    --  directories when Include_Externally_Built is set to True.
 
+   function List_Source_Extensions
+     (Self : Context) return LSP.Ada_File_Sets.Extension_Sets.Set;
+   --  List all extensions for the current project.
+
    function Get_AU
      (Self    : Context;
       File    : GNATCOLL.VFS.Virtual_File;
@@ -355,6 +359,9 @@ private
       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
+
       PP_Options : Utils.Command_Lines.Command_Line
                     (Pp.Command_Lines.Descriptor'Access);
       --  Object to keep gnatpp options

source/ada/lsp-ada_file_sets.ads

@@ -28,10 +28,18 @@ with Libadalang.Analysis;
 with Langkit_Support.Slocs;
 
 with VSS.Strings;
+with VSS.Strings.Hash;
 with LSP.Search;
 
 package LSP.Ada_File_Sets is
 
+   package Extension_Sets is
+     new Ada.Containers.Hashed_Sets
+       (Element_Type        => VSS.Strings.Virtual_String,
+        Hash                => VSS.Strings.Hash,
+        Equivalent_Elements => VSS.Strings."=",
+        "="                 => VSS.Strings."=");
+
    package File_Sets is new Ada.Containers.Ordered_Sets
      (Element_Type        => GNATCOLL.VFS.Virtual_File,
       "<"                 => GNATCOLL.VFS."<",

source/ada/lsp-ada_handlers-file_readers.adb

@@ -15,6 +15,7 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with Ada.Streams;
 with GNAT.Strings;                 use GNAT.Strings;
 
 with GNATCOLL.Traces;              use GNATCOLL.Traces;

source/ada/lsp-ada_handlers.adb

@@ -213,16 +213,6 @@ package body LSP.Ada_Handlers is
       Document : not null LSP.Ada_Documents.Document_Access);
    --  Publish diagnostic messages for given document if needed
 
-   function Is_Ada_Source
-     (Self : access Message_Handler;
-      File : GNATCOLL.VFS.Virtual_File)
-            return Boolean
-   is (Is_Ada_File (Self.Project_Tree, File));
-   --  Checks if File is an Ada source of Self's project. This is needed
-   --  to filter non Ada sources on notifications like
-   --  DidCreate/Rename/DeleteFiles and DidChangeWatchedFiles since it's not
-   --  possible to filter them in the FileOperationRegistrationOptions.
-
    function Compute_File_Operations_Server_Capabilities
      (Self : access Message_Handler)
       return LSP.Messages.Optional_FileOperationsServerCapabilities;
@@ -234,10 +224,8 @@ package body LSP.Ada_Handlers is
      (Self : access Message_Handler)
       return LSP.Messages.FileOperationRegistrationOptions;
    --  Computes FileOperationRegistrationOptions based on the project held by
-   --  Self. These registration options will include any file that is in a
-   --  source folder of Self's project. We can't filter non Ada sources here,
-   --  only on the DidCreate/Rename/DeleteFiles and DidChangeWatchedFiles
-   --  notifications.
+   --  Self. These registration options will include Ada file that is in a
+   --  source folder of Self's project.
 
    function Format
      (Self     : in out LSP.Ada_Contexts.Context;
@@ -848,6 +836,7 @@ package body LSP.Ada_Handlers is
         LSP.Messages.Optional_FileOperationsClientCapabilities
           renames Self.Client.capabilities.workspace.fileOperations;
    begin
+
       if Client_Capabilities.Is_Set
         and then not Self.Contexts.Each_Context.Is_Empty
       then
@@ -894,27 +883,53 @@ package body LSP.Ada_Handlers is
       return LSP.Messages.FileOperationRegistrationOptions
    is
       use LSP.Messages;
+      use LSP.Ada_File_Sets.Extension_Sets;
+      use VSS.Strings;
 
       File_Operation_Filters : LSP.Messages.FileOperationFilter_Vector;
 
    begin
+
       for Context of Self.Contexts.Each_Context loop
-         for Source_Dir of Context.List_Source_Directories loop
-            declare
-               Dir_Full_Name : constant GNATCOLL.VFS.Filesystem_String :=
-                 GNATCOLL.VFS."/" (Source_Dir, "*").Full_Name;
-               Scheme        : constant VSS.Strings.Virtual_String := "file";
-               Sources_Glob  : constant VSS.Strings.Virtual_String :=
-                 VSS.Strings.Conversions.To_Virtual_String (+Dir_Full_Name);
-
-               File_Operation_Filter :
-                 constant LSP.Messages.FileOperationFilter :=
-                   (scheme => (Is_Set => True, Value => Scheme),
-                    pattern => (glob => Sources_Glob, others => <>));
-            begin
-               File_Operation_Filters.Append (File_Operation_Filter);
-            end;
-         end loop;
+         declare
+            Extensions_Set    : constant LSP.Ada_File_Sets.Extension_Sets.Set
+              := Context.List_Source_Extensions;
+            --  Need to lock the Set in a local variable for the cursor to stay
+            --  valid.
+            Extension_Pattern : VSS.Strings.Virtual_String := "{";
+            Extension_Cursor  : LSP.Ada_File_Sets.Extension_Sets.Cursor :=
+              First (Extensions_Set);
+         begin
+            while Has_Element (Extension_Cursor) loop
+               Extension_Pattern.Append (Element (Extension_Cursor));
+               Next (Extension_Cursor);
+               if Has_Element (Extension_Cursor) then
+                  Extension_Pattern.Append (",");
+               else
+                  Extension_Pattern.Append ("}");
+               end if;
+            end loop;
+
+            for Source_Dir of Context.List_Source_Directories loop
+               declare
+                  Dir_Full_Name : constant GNATCOLL.VFS.Filesystem_String :=
+                    GNATCOLL.VFS."/" (Source_Dir, "*").Full_Name;
+                  Scheme        : constant VSS.Strings.Virtual_String :=
+                    "file";
+                  Sources_Glob  : constant VSS.Strings.Virtual_String :=
+                    VSS.Strings.Conversions.To_Virtual_String (+Dir_Full_Name);
+
+                  File_Operation_Filter :
+                  constant LSP.Messages.FileOperationFilter :=
+                    (scheme  => (Is_Set => True,
+                                 Value  => Scheme),
+                     pattern => (glob   => Sources_Glob & Extension_Pattern,
+                                 others => <>));
+               begin
+                  File_Operation_Filters.Append (File_Operation_Filter);
+               end;
+            end loop;
+         end;
       end loop;
 
       return
@@ -4787,16 +4802,14 @@ package body LSP.Ada_Handlers is
       for Change of Value.changes loop
          URI := Change.uri;
          File := Self.To_File (URI);
-         if Self.Is_Ada_Source (File) then
-            case Change.a_type is
-               when LSP.Messages.Created =>
-                  Process_Created_File;
-               when LSP.Messages.Deleted =>
-                  Process_Deleted_File;
-               when LSP.Messages.Changed =>
-                  Process_Changed_File;
-            end case;
-         end if;
+         case Change.a_type is
+            when LSP.Messages.Created =>
+               Process_Created_File;
+            when LSP.Messages.Deleted =>
+               Process_Deleted_File;
+            when LSP.Messages.Changed =>
+               Process_Changed_File;
+         end case;
       end loop;
    end On_DidChangeWatchedFiles_Notification;
 
@@ -5442,18 +5455,16 @@ package body LSP.Ada_Handlers is
             --  Context.
 
          begin
-            if Self.Is_Ada_Source (Created_File) then
-               for Context of Self.Contexts.Each_Context
-                 (Has_Dir'Unrestricted_Access)
-               loop
-                  Context.Include_File (Created_File);
-                  Context.Index_File (Created_File);
+            for Context of Self.Contexts.Each_Context
+              (Has_Dir'Unrestricted_Access)
+            loop
+               Context.Include_File (Created_File);
+               Context.Index_File (Created_File);
 
-                  Self.Trace.Trace
-                    ("Included " & Created_File.Display_Base_Name
-                     & " in context " & To_UTF_8_String (Context.Id));
-               end loop;
-            end if;
+               Self.Trace.Trace
+                 ("Included " & Created_File.Display_Base_Name
+                  & " in context " & To_UTF_8_String (Context.Id));
+            end loop;
          end;
       end loop;
 
@@ -5531,22 +5542,20 @@ package body LSP.Ada_Handlers is
             URI_Contexts : Context_Lists.List;
 
          begin
-            if Self.Is_Ada_Source (Old_File) then
-               for Context of Self.Contexts.Each_Context
-                 (Has_File'Unrestricted_Access)
-               loop
-                  URI_Contexts.Append (Context);
-                  Context.Exclude_File (Old_File);
-                  Context.Index_File (Old_File);
+            for Context of Self.Contexts.Each_Context
+              (Has_File'Unrestricted_Access)
+            loop
+               URI_Contexts.Append (Context);
+               Context.Exclude_File (Old_File);
+               Context.Index_File (Old_File);
 
-                  Self.Trace.Trace
-                    ("Excluded " & Old_File.Display_Full_Name
-                     & " from context " & To_UTF_8_String (Context.Id));
-               end loop;
+               Self.Trace.Trace
+                 ("Excluded " & Old_File.Display_Full_Name
+                  & " from context " & To_UTF_8_String (Context.Id));
+            end loop;
 
-               URIs_Contexts.Insert
-                 (To_LSP_URI (File_Rename.oldUri), URI_Contexts);
-            end if;
+            URIs_Contexts.Insert
+              (To_LSP_URI (File_Rename.oldUri), URI_Contexts);
          end;
       end loop;
 
@@ -5569,22 +5578,20 @@ package body LSP.Ada_Handlers is
             Is_Document_Open : constant Boolean := Document /= null;
 
          begin
-            if Self.Is_Ada_Source (New_File) then
-               for Context of
-                 URIs_Contexts.Constant_Reference
-                   (To_LSP_URI (File_Rename.oldUri))
-               loop
-                  Context.Include_File (New_File);
-                  if Is_Document_Open then
-                     Context.Index_Document (Document.all);
-                  else
-                     Context.Index_File (New_File);
-                  end if;
-                  Self.Trace.Trace
-                    ("Included " & New_File.Display_Base_Name & " in context "
-                     & To_UTF_8_String (Context.Id));
-               end loop;
-            end if;
+            for Context of
+              URIs_Contexts.Constant_Reference
+                (To_LSP_URI (File_Rename.oldUri))
+            loop
+               Context.Include_File (New_File);
+               if Is_Document_Open then
+                  Context.Index_Document (Document.all);
+               else
+                  Context.Index_File (New_File);
+               end if;
+               Self.Trace.Trace
+                 ("Included " & New_File.Display_Base_Name & " in context "
+                  & To_UTF_8_String (Context.Id));
+            end loop;
          end;
       end loop;
 
@@ -5643,19 +5650,17 @@ package body LSP.Ada_Handlers is
             --  Context.
 
          begin
-            if Self.Is_Ada_Source (Deleted_File) then
-               for Context of Self.Contexts.Each_Context
-                 (Has_File'Unrestricted_Access)
-               loop
-                  Context.Exclude_File (Deleted_File);
-                  Context.Index_File (Deleted_File);
+            for Context of Self.Contexts.Each_Context
+              (Has_File'Unrestricted_Access)
+            loop
+               Context.Exclude_File (Deleted_File);
+               Context.Index_File (Deleted_File);
 
-                  Self.Trace.Trace
-                    ("Excluded " & Deleted_File.Display_Base_Name
-                     & " from context "
-                     & VSS.Strings.Conversions.To_UTF_8_String (Context.Id));
-               end loop;
-            end if;
+               Self.Trace.Trace
+                 ("Excluded " & Deleted_File.Display_Base_Name
+                  & " from context "
+                  & VSS.Strings.Conversions.To_UTF_8_String (Context.Id));
+            end loop;
          end;
       end loop;