Merge branch 'topic/merge_edge' into 'master'

Merge from edge

See merge request eng/ide/ada_language_server!1490

Author: AnthonyLeonardoGracio

.github/workflows/release.sh

@@ -39,20 +39,22 @@ echo "upload_url=$upload_url"
 chmod -R -v +x als-*-$DEBUG
 
 for CROSS in "" "aarch64" ; do
-for X in Linux macOS Windows ; do
-  FILE=als-$TAG-$X${DEBUG:+-debug}_${CROSS:-amd64}.zip
-  cd als-$X-$DEBUG$CROSS
-  zip -9 -r ../$FILE .
-  cd ..
-
-  # Upload $FILE as an asset to the release
-  curl \
-    -X POST \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: token $GITHUB_ACCESS_TOKEN" \
-    -H 'Content-Type: application/zip' \
-    --data-binary @$FILE \
-    $upload_url?name=$FILE
-  rm -v -f $FILE
+  for X in Linux macOS Windows ; do
+    FILE=als-$TAG-$X${DEBUG:+-debug}_${CROSS:-amd64}.zip
+    if [ -d als-$X-$DEBUG$CROSS ] ; then
+      cd als-$X-$DEBUG$CROSS
+      zip -9 -r ../$FILE .
+      cd ..
+
+      # Upload $FILE as an asset to the release
+      curl \
+        -X POST \
+        -H "Accept: application/vnd.github+json" \
+        -H "Authorization: token $GITHUB_ACCESS_TOKEN" \
+        -H 'Content-Type: application/zip' \
+        --data-binary @$FILE \
+        $upload_url?name=$FILE
+      rm -v -f $FILE
+    fi
+  done
 done
-done

source/ada/lsp-ada_handlers-project_loading.adb

@@ -401,7 +401,7 @@ package body LSP.Ada_Handlers.Project_Loading is
                Project_Environment.Build_Path :=
                  GPR2.Path_Name.Create_Directory
                    (GPR2.Path_Name.Create (GPR).Relative_Path
-                     (GPR2.Path_Name.Create (Root_Dir)).Name,
+                     (GPR2.Path_Name.Create (Root_Dir)),
                       GPR2.Filename_Type
                        (Project_Environment.Build_Path.Value));
             end if;

source/gpr/lsp-gpr_files.ads

@@ -47,6 +47,8 @@ with LSP.Tracers;
 
 package LSP.GPR_Files is
 
+   use GPR2; --  temporary workaround of a coverage instrumentation problem
+
    type File (Tracer : not null LSP.Tracers.Tracer_Access) is
      tagged limited private;
    --  A parsed GPR file.
@@ -215,8 +217,6 @@ package LSP.GPR_Files is
 
 private
 
-   use GPR2;
-
    type Source_Position is record
       Line   : Integer;
       Column : Integer;

testsuite/gpr_lsp/hover/test.yaml

@@ -1 +1,3 @@
 title: 'textDocument/hover request'
+skip:
+    - ['SKIP', 'env.build.os.name not in ("linux","windows")']

testsuite/gpr_lsp/shutdown/test.yaml

@@ -1 +1,3 @@
 title: 'shutdown'
+skip:
+    - ['SKIP', 'env.build.os.name not in ("linux","windows")']