Merge branch 'topic/als#1637' into 'master'

Handle aggregate projects in 'als-executables' command

See merge request eng/ide/ada_language_server!2032

Author: AnthonyLeonardoGracio

source/ada/lsp-ada_handlers-executables_commands.adb

@@ -55,18 +55,21 @@ package body LSP.Ada_Handlers.Executables_Commands is
       end Append;
 
       Value   : VSS.Strings.Virtual_String;
-      Element : GPR2.Project.View.Object;
    begin
       Response := (Is_Null => False, Value => <>);
       Append ((Kind => VSS.JSON.Streams.Start_Array));
 
       if Handler.Project_Tree.Is_Defined then
-         Element := Handler.Project_Tree.Root_Project;
-
-         for Exec of Element.Executables loop
-            Value := VSS.Strings.Conversions.To_Virtual_String
-              (String (Exec.Value));
-            Append ((VSS.JSON.Streams.String_Value, Value));
+         --  Iterate over all the root projects defined in the project tree
+         --  to handle aggregate projects properly (i.e: by combining the
+         --  executables defined for each aggregated project).
+         for View of Handler.Project_Tree.Namespace_Root_Projects loop
+            for Exec of View.Executables loop
+               Value :=
+                 VSS.Strings.Conversions.To_Virtual_String
+                   (String (Exec.Value));
+               Append ((VSS.JSON.Streams.String_Value, Value));
+            end loop;
          end loop;
       end if;
 

testsuite/ada_lsp/commands.executables.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.executables.aggregate/main_1.adb

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,106 @@
+[
+   {
+      "comment": [
+         "Check als-executable command for aggregate projects.  ",
+         "The result should combine all the executables 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-executables"]
+                     }
+                  }
+               }
+            }
+         ]
+      }
+   },
+   {
+      "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-executables"
+            }
+         },
+         "wait": [
+            {
+               "jsonrpc": "2.0",
+               "id": "sw1",
+               "result": ["$FILE{main_1}", "$FILE{main_2}", "$FILE{main_3}"]
+            }
+         ]
+      }
+   },
+   {
+      "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.executables.aggregate/test.yaml

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