Merge remote branch 'origin/master' into edge

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

Author: mergerepo

source/ada/lsp-ada_handlers.adb

@@ -3298,23 +3298,6 @@ package body LSP.Ada_Handlers is
    is
       use type GNATCOLL.JSON.JSON_Value_Type;
 
-      function Match
-        (Left  : GNATCOLL.VFS.Filesystem_String;
-         Right : GNATCOLL.VFS.Virtual_File) return Boolean;
-      --  Compare two files
-
-      -----------
-      -- Match --
-      -----------
-
-      function Match
-        (Left  : GNATCOLL.VFS.Filesystem_String;
-         Right : GNATCOLL.VFS.Virtual_File) return Boolean is
-      begin
-         return (Left = "" and then Right = No_File)
-           or else GNATCOLL.VFS.Create (Left) = Right;
-      end Match;
-
       relocateBuildTree                 : constant String :=
         "relocateBuildTree";
       rootDir                           : constant String :=
@@ -3430,7 +3413,6 @@ package body LSP.Ada_Handlers is
          --  relative path; if so, we're assuming it's relative
          --  to Self.Root.
          declare
-            use type GNATCOLL.Projects.Project_Tree_Access;
             Project_File : constant String := To_UTF_8_String (File);
             GPR : Virtual_File;
          begin
@@ -3440,23 +3422,13 @@ package body LSP.Ada_Handlers is
                GPR := Join (Self.Root, Create_From_UTF8 (Project_File));
             end if;
 
-            --  Avoid project reloading if scenario/gpr are the same
-            if Self.Project_Tree = null
-              or else Self.Charset /= Charset
-              or else Self.Project_Tree.Root_Project.Project_Path /= GPR
-              or else Self.Scenario /= Variables
-              or else not Match (Self.Project_Environment.Build_Tree_Dir,
-                                 Relocate)
-              or else not Match (Self.Project_Environment.Root_Dir, Root)
-            then
-               Self.Load_Project
-                 (GPR,
-                  Variables,
-                  To_String (Charset),
-                  Valid_Project_Configured,
-                  Relocate,
-                  Root);
-            end if;
+            Self.Load_Project
+              (GPR,
+               Variables,
+               To_String (Charset),
+               Valid_Project_Configured,
+               Relocate,
+               Root);
          end;
       end if;
 
@@ -3625,10 +3597,6 @@ package body LSP.Ada_Handlers is
       --  We're loading an actual project
       Self.Project_Status := Status;
 
-      --  Store scenario variables and charset
-      Self.Scenario := Scenario;
-      Self.Charset := To_Unbounded_String (Charset);
-
       --  Now load the new project
       Errors.a_type := LSP.Messages.Warning;
       Self.Project_Environment :=

source/ada/lsp-ada_handlers.ads

@@ -20,7 +20,6 @@
 
 with Ada.Containers.Hashed_Maps;
 with Ada.Containers.Hashed_Sets;
-with Ada.Strings.Unbounded;
 with VSS.String_Vectors;
 
 with GNATCOLL.VFS;    use GNATCOLL.VFS;
@@ -279,10 +278,10 @@ private
       Project_Status : Load_Project_Status := No_Project_Found;
       --  Status of loading the project
 
-      Scenario : LSP.Types.LSP_Any;
+--      Scenario : LSP.Types.LSP_Any;
       --  Last used scenario variables
 
-      Charset : Ada.Strings.Unbounded.Unbounded_String;
+--      Charset : Ada.Strings.Unbounded.Unbounded_String;
       --  Character set from didChangeConfiguration
 
       Project_Dirs_Loaded : File_Sets.Set;