Enable Alire

Author: ogorodnik

gnat/ignore_in_317.txt

@@ -1,5 +1,3 @@
-lsp-ada_handlers-alire.adb
-lsp-ada_handlers-alire.ads
 lsp-common.adb
 lsp-common.ads
 lsp-error_decorators.adb

source/ada/lsp-ada_handlers-alire.adb

@@ -21,6 +21,7 @@ with GNAT.OS_Lib;
 with VSS.Stream_Element_Vectors;
 with VSS.Strings.Conversions;
 with VSS.Strings.Converters.Decoders;
+with VSS.String_Vectors;
 with VSS.Characters.Latin;
 with VSS.Regular_Expressions;
 

source/ada/lsp-ada_handlers-project_loading.adb

@@ -37,6 +37,7 @@ with Spawn.Environments;
 
 with LSP.Ada_Contexts;
 with LSP.Ada_Context_Sets;
+with LSP.Ada_Handlers.Alire;
 with LSP.Ada_Handlers.File_Readers;
 with LSP.Ada_Indexing;
 with LSP.Enumerations;
@@ -51,26 +52,6 @@ package body LSP.Ada_Handlers.Project_Loading is
                              GNATCOLL.Traces.On);
    --  Trace to enable/disable runtime indexing. Useful for the testsuite.
 
-   package Alire is
-
-      procedure Run_Alire
-        (Root        : String;
-         Has_Alire   : out Boolean;
-         Error       : out VSS.Strings.Virtual_String;
-         Project     : out VSS.Strings.Virtual_String;
-         Environment : in out GPR2.Environment.Object) is null;
-      --  if Root directory contains `alire.toml` file, then run
-      --  `alr printenv` and fetch the first project from `alire.toml`.
-
-      procedure Run_Alire
-        (Root        : String;
-         Has_Alire   : out Boolean;
-         Error       : out VSS.Strings.Virtual_String;
-         Environment : in out GPR2.Environment.Object) is null;
-      --  The same as above, but without fetching the project file
-
-   end Alire;
-
    procedure Load_Project_With_Alire
      (Self               : in out Message_Handler'Class;
       Project_File       : VSS.Strings.Virtual_String := "";
@@ -552,7 +533,7 @@ package body LSP.Ada_Handlers.Project_Loading is
 
          if Project.Is_Empty then
 
-            Alire.Run_Alire
+            LSP.Ada_Handlers.Alire.Run_Alire
               (Root        => Root (Self).Display_Full_Name,
                Has_Alire   => Has_Alire,
                Error       => Errors,
@@ -562,7 +543,7 @@ package body LSP.Ada_Handlers.Project_Loading is
             Status := Alire_Project;
          else
 
-            Alire.Run_Alire
+            LSP.Ada_Handlers.Alire.Run_Alire
               (Root        => Root (Self).Display_Full_Name,
                Has_Alire   => Has_Alire,
                Error       => Errors,

testsuite/ada_lsp/project_config.alire/test.json

@@ -77,7 +77,7 @@
             },
             "wait":[{
                 "id": "defname-1",
-                "result":[{
+                "result":{
                     "uri": "$URI{alire/cache/dependencies/libhello_1.0.1_3c15bc7f/src/libhello.ads}",
                     "range": {
                         "start": {
@@ -89,7 +89,7 @@
                             "character": 24
                         }
                     }
-                }]
+                }
             }]
         }
     },  {

testsuite/ada_lsp/project_config.alire/test.yaml

@@ -1,5 +1,3 @@
 title: 'project_config.alire'
 skip:
     - ['SKIP', 'env.build.os.name == "windows"']
-    # Skip till 3.17 ready
-    - ['XFAIL', 'True']