Merge remote branch 'origin/master' into edge

Author: automatic-merge

integration/vscode/ada/syntaxes/gpr.tmLanguage.json

@@ -276,7 +276,7 @@
         },
         "project": {
             "name": "meta.project.gpr",
-            "begin": "(?i)\\b(?:(abstract|aggregate|library)\\s+)?(project)\\s+((?:\\w|\\d|_)+)\\b",
+            "begin": "(?i)\\b(?:(abstract|aggregate|library|standard)\\s+)?(project)\\s+((?:\\w|\\d|_)+)\\b",
             "end": "(?i)\\b(end)\\s+(\\3)\\s*(;)",
             "beginCaptures": {
                 "1": { "name": "keyword.gpr" },
@@ -304,7 +304,8 @@
                         { "include": "#comment" },
                         { "include": "#attribute" },
                         { "include": "#type" },
-                        { "include": "#variable" }
+                        { "include": "#variable" },
+                        { "include": "#case_construction" }
                     ]
                 },
                 {

integration/vscode/ada/test/suite/general/highlighting.test.ts

@@ -56,7 +56,7 @@ suite('Highlighting', function () {
         });
     }
 
-    const gprTests = ['prj.gpr', 'src/test.gpr'];
+    const gprTests = ['prj.gpr', 'src/test.gpr', 'src/ada_libfswatch.gpr'];
 
     for (const relPath of gprTests) {
         const gprSyntaxPath = path.join(extensionRootPath, 'syntaxes', 'gpr.tmLanguage.json');

integration/vscode/ada/test/workspaces/general/src/ada_libfswatch.gpr

@@ -0,0 +1,40 @@
+--  This project has been generated by GPRINSTALL Pro 26.0w (20241106) (x86_64-pc-linux-gnu)
+
+with "c_libfswatch";
+with "c_libfswatch";
+with "gnatcoll_core";
+with "gnatcoll_minimal";
+
+standard project Ada_Libfswatch is
+   type BUILD_KIND is ("default");
+   BUILD : BUILD_KIND := external("ADA_LIBFSWATCH_BUILD", "default");
+
+   for Languages use ("Ada");
+
+   case BUILD is
+      when "default" =>
+         for Source_Dirs use ("../../include/ada_libfswatch");
+         for Object_Dir use "../../lib/ada_libfswatch";
+   end case;
+
+   package Naming is
+      case BUILD is
+         when "default" =>
+            null;
+      end case;
+   end Naming;
+
+   package Linker is
+      case BUILD is
+         when "default" =>
+            null;
+      end case;
+   end Linker;
+
+   package Install is
+      for Active use "False";
+   end Install;
+
+   for Externally_Built use "True";
+
+end Ada_Libfswatch;