Handle aggregate projects in 'als-mains' command

By grouping all the mains of each aggregated project together.

For eng/ide/ada_language_server#1637

Author: AnthonyLeonardoGracio

source/ada/lsp-ada_handlers-mains_commands.adb

@@ -18,6 +18,7 @@
 with Ada.Containers.Indefinite_Vectors;
 with GPR2.Project.View;
 
+with GPR2.Project.View.Set;
 with VSS.JSON.Streams;
 
 package body LSP.Ada_Handlers.Mains_Commands is
@@ -47,6 +48,9 @@ package body LSP.Ada_Handlers.Mains_Commands is
       Response : in out LSP.Structures.LSPAny_Or_Null;
       Error    : in out LSP.Errors.ResponseError_Optional)
    is
+      function Get_Main_Paths
+        (Views : GPR2.Project.View.Set.Object) return Main_Vectors.Vector;
+
       procedure Append (Item : VSS.JSON.Streams.JSON_Stream_Element);
 
       ------------
@@ -58,28 +62,47 @@ package body LSP.Ada_Handlers.Mains_Commands is
          Response.Value.Append (Item);
       end Append;
 
-      Element    : GPR2.Project.View.Object;
+      --------------------
+      -- Get_Main_Paths --
+      --------------------
+
+      function Get_Main_Paths
+        (Views : GPR2.Project.View.Set.Object) return Main_Vectors.Vector
+      is
+         Main_Paths : Main_Vectors.Vector;
+      begin
+         for View of Views loop
+            if View.Has_Mains then
+               for Main of View.Mains loop
+                  declare
+                     Main_Path : constant String := String (Main.Source.Value);
+                  begin
+                     --  Avoid duplicates coming from GPR2
+                     --  Workaround for eng/ide/gpr-issues#417
+                     if not Main_Paths.Contains (Main_Path) then
+                        Main_Paths.Append (Main_Path);
+                     end if;
+                  end;
+               end loop;
+            end if;
+         end loop;
+
+         return Main_Paths;
+      end Get_Main_Paths;
+
+      Views      : GPR2.Project.View.Set.Object;
       Main_Paths : Main_Vectors.Vector;
    begin
       Response := (Is_Null => False, Value => <>);
       Append ((Kind => VSS.JSON.Streams.Start_Array));
 
+      --  If the project was correctly loaded, iterate over each
+      --  subtree to get their list of mains.
+      --  This is needed to handle aggregate projects: we want to
+      --  combine the mains of each aggregated project in this case.
       if Handler.Project_Tree.Is_Defined then
-         Element := Handler.Project_Tree.Root_Project;
-
-         if Element.Has_Mains then
-            for Main of Element.Mains loop
-               declare
-                  Main_Path : constant String := String (Main.Source.Value);
-               begin
-                  --  Avoid duplicates coming from GPR2
-                  --  Workaround for eng/ide/gpr-issues#417
-                  if not Main_Paths.Contains (Main_Path) then
-                     Main_Paths.Append (Main_Path);
-                  end if;
-               end;
-            end loop;
-         end if;
+         Views := Handler.Project_Tree.Namespace_Root_Projects;
+         Main_Paths := Get_Main_Paths (Views);
       end if;
 
       for Main_Path of Main_Paths loop

testsuite/ada_lsp/commands.mains.aggregate/aggr.gpr

@@ -0,0 +1,3 @@
+aggregate project Aggr is
+   for Project_Files use ("project_1.gpr", "project_2.gpr");
+end Aggr;

testsuite/ada_lsp/commands.mains.aggregate/main_1.adb

@@ -0,0 +1,4 @@
+procedure Main_1 is
+begin
+   null;
+end Main_1;

testsuite/ada_lsp/commands.mains.aggregate/main_2.adb

@@ -0,0 +1,4 @@
+procedure Main_2 is
+begin
+   null;
+end Main_2;

testsuite/ada_lsp/commands.mains.aggregate/main_3.adb

@@ -0,0 +1,4 @@
+procedure Main_3 is
+begin
+   null;
+end Main_3;

testsuite/ada_lsp/commands.mains.aggregate/project_1.gpr

@@ -0,0 +1,3 @@
+project Project_1 is
+   for Main use ("main_1.adb", "main_2.adb");
+end Project_1;

testsuite/ada_lsp/commands.mains.aggregate/project_2.gpr

@@ -0,0 +1,3 @@
+project Project_2 is
+   for Main use ("main_3.adb");
+end Project_2;

testsuite/ada_lsp/commands.mains.aggregate/test.json

@@ -0,0 +1,110 @@
+[
+   {
+      "comment": [
+         "Check als-mains command for aggregate projects.  ",
+         "The result should combine all the mains of all the projects being aggregated."
+      ]
+   },
+   {
+      "start": {
+         "cmd": ["${ALS}"]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": 0,
+            "method": "initialize",
+            "params": {
+               "processId": 1,
+               "rootUri": "$URI{.}",
+               "capabilities": {}
+            }
+         },
+         "wait": [
+            {
+               "id": 0,
+               "result": {
+                  "capabilities": {
+                     "textDocumentSync": 2,
+                     "executeCommandProvider": {
+                        "commands": ["<HAS>", "als-mains"]
+                     }
+                  }
+               }
+            }
+         ]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "method": "workspace/didChangeConfiguration",
+            "params": {
+               "settings": {
+                  "ada": {
+                     "projectFile": "$URI{aggr.gpr}"
+                  }
+               }
+            }
+         },
+         "wait": [
+            {
+               "jsonrpc": "2.0",
+               "id": 1,
+               "method": "window/workDoneProgress/create",
+               "params": {
+                  "token": "<ANY>"
+               }
+            }
+         ]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": "sw1",
+            "method": "workspace/executeCommand",
+            "params": {
+               "command": "als-mains"
+            }
+         },
+         "wait": [
+            {
+               "jsonrpc": "2.0",
+               "id": "sw1",
+               "result": [
+                  "$FILE{main_1.adb}",
+                  "$FILE{main_2.adb}",
+                  "$FILE{main_3.adb}"
+               ]
+            }
+         ]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": "shutdown",
+            "method": "shutdown",
+            "params": null
+         },
+         "wait": [{ "id": "shutdown", "result": null }]
+      }
+   },
+   {
+      "send": {
+         "request": { "jsonrpc": "2.0", "method": "exit" },
+         "wait": []
+      }
+   },
+   {
+      "stop": {
+         "exit_code": 0
+      }
+   }
+]

testsuite/ada_lsp/commands.mains.aggregate/test.yaml

@@ -0,0 +1 @@
+title: 'commands.mains.aggregate'