Merge branch 'topic/bump' into 'master'

Apply edge patches to master

See merge request eng/ide/ada_language_server!2114

Author: eliericha

gnat/lsp_server.gpr

@@ -1,5 +1,5 @@
 --
---  Copyright (C) 2018-2024, AdaCore
+--  Copyright (C) 2018-2025, AdaCore
 --
 --  SPDX-License-Identifier: Apache-2.0
 --
@@ -12,6 +12,7 @@ with "ada_libfswatch.gpr";
 with "libgnatdoc.gpr";
 with "spawn.gpr";
 with "gnatformat.gpr";
+with "vss_os.gpr";
 with "xdiff.gpr";
 
 with "lsp_3_17";

gnat/tester.gpr

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                        Copyright (C) 2018, AdaCore                       --
+--                     Copyright (C) 2018-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -17,6 +17,7 @@
 
 with "lsp_client";
 with "gnatcoll";
+with "vss_os.gpr";
 
 project Tester is
 

source/ada/lsp-ada_highlighters.adb

@@ -741,7 +741,7 @@ package body LSP.Ada_Highlighters is
          end case;
       end To_Kind;
 
-      Failsafe_Def : Libadalang.Analysis.Refd_Def;
+      Failsafe_Decl : Libadalang.Analysis.Refd_Decl;
       Def  : Libadalang.Analysis.Defining_Name;
       Decl : Libadalang.Analysis.Basic_Decl;
       Kind : LSP.Enumerations.SemanticTokenTypes;
@@ -772,8 +772,8 @@ package body LSP.Ada_Highlighters is
                Highlight_Token (Node.Token_Start, declaration);
          end;
       else
-         Failsafe_Def := Node.P_Failsafe_Referenced_Def_Name (True);
-         Def :=  Libadalang.Analysis.Defining_Name (Failsafe_Def.Def_Name);
+         Failsafe_Decl := Node.P_Failsafe_Referenced_Decl (True);
+         Def :=  Libadalang.Analysis.Defining_Name (Failsafe_Decl.Def_Name);
       end if;
 
       if Node.Kind in Libadalang.Common.Ada_Name then