Merge pull request AdaCore#34 from AdaCore/topic/client

Topic/client

Author: reznikmm

gnat/spawn_glib.gpr

@@ -19,8 +19,8 @@ with "gtkada";
 
 project Spawn_Glib is
 
-   type OS_API_Kind is ("Windows_NT", "Posix");
-   OS_API : OS_API_Kind := external ("OS", "Posix");
+   type OS_API_Kind is ("unix", "osx", "Windows_NT");
+   OS_API : OS_API_Kind := external ("OS", "unix");
 
    for Source_Dirs use ("../source/spawn");
    for Object_Dir use "../.obj/spawn";
@@ -31,7 +31,7 @@ project Spawn_Glib is
       "spawn-processes-monitor_loop.adb");
 
    case OS_API is
-      when "Posix" =>
+      when "unix" | "osx" =>
          for Excluded_Source_Files use Common_Excluded &
            ("spawn-windows_api.ads",
             "spawn-processes-windows.ads",
@@ -47,7 +47,7 @@ project Spawn_Glib is
 
    package Naming is
       case OS_API is
-         when "Posix" =>
+         when "unix" | "osx" =>
             for Spec ("Spawn.Internal")
                use "spawn-internal__glib.ads";
             for Body ("Spawn.Internal")

source/ada/lsp-ada_handlers.ads

@@ -16,6 +16,7 @@
 ------------------------------------------------------------------------------
 
 with LSP.Message_Handlers;
+with LSP.Notification_Handlers;
 with LSP.Messages;
 with LSP.Servers;
 
@@ -27,15 +28,15 @@ package LSP.Ada_Handlers is
      (Server  : access LSP.Servers.Server;
       Context : access LSP.Ada_Contexts.Context) is
    limited new LSP.Message_Handlers.Request_Handler
-     and LSP.Message_Handlers.Notification_Handler with private;
+     and LSP.Notification_Handlers.Notification_Handler with private;
 
 private
 
    type Message_Handler
      (Server : access LSP.Servers.Server;
       Context : access LSP.Ada_Contexts.Context)
    is limited new LSP.Message_Handlers.Request_Handler
-     and LSP.Message_Handlers.Notification_Handler with record
+     and LSP.Notification_Handlers.Notification_Handler with record
       null;
    end record;
 

source/client/lsp-clients.adb

@@ -144,7 +144,18 @@ package body LSP.Clients is
                      Params  => Params);
                end;
             else
-               raise Constraint_Error with "Unknown request";
+               declare
+                  Error : LSP.Messages.ResponseMessage :=
+                    (error =>
+                       (True,
+                        (code => LSP.Messages.MethodNotFound,
+                         message =>
+                           +("Unknown method:" & Value.Get ("method")),
+                         data => <>)),
+                     others => <>);
+               begin
+                  Self.Send_Response (Id, Error);
+               end;
             end if;
          else
             --  Response from server
@@ -175,7 +186,7 @@ package body LSP.Clients is
       Value.method := +Method;
       LSP.Messages.NotificationMessage'Class'Write (JS'Access, Value);
       JSON := GNATCOLL.JSON.Get (JS.Get_JSON_Document, 1);
-      Self.Send_Request (JSON.Write);
+      Self.Send_Message (JSON.Write);
    end Send_Notification;
 
    ------------------
@@ -201,7 +212,7 @@ package body LSP.Clients is
       Value.id := (True, Request);
       LSP.Messages.RequestMessage'Class'Write (JS'Access, Value);
       JSON := GNATCOLL.JSON.Get (JS.Get_JSON_Document, 1);
-      Self.Send_Request (JSON.Write);
+      Self.Send_Message (JSON.Write);
    end Send_Request;
 
    -------------------------
@@ -239,6 +250,25 @@ package body LSP.Clients is
       Self.Send_Request (Request, "shutdown", null, Message);
    end Shutdown_Request;
 
+   -------------------
+   -- Send_Response --
+   -------------------
+
+   procedure Send_Response
+     (Self    : in out Client'Class;
+      Request : LSP.Types.LSP_Number_Or_String;
+      Value   : in out LSP.Messages.ResponseMessage'Class)
+   is
+      JS : aliased LSP.JSON_Streams.JSON_Stream;
+      JSON : GNATCOLL.JSON.JSON_Value;
+   begin
+      Value.jsonrpc := +"2.0";
+      Value.id := Request;
+      LSP.Messages.ResponseMessage'Class'Write (JS'Access, Value);
+      JSON := GNATCOLL.JSON.Get (JS.Get_JSON_Document, 1);
+      Self.Send_Message (JSON.Write);
+   end Send_Response;
+
    ---------------------------------------
    -- Text_Document_Code_Action_Request --
    ---------------------------------------
@@ -426,18 +456,11 @@ package body LSP.Clients is
       Request : LSP.Types.LSP_Number_Or_String;
       Applied : Boolean)
    is
-      Message : constant LSP.Messages.ApplyWorkspaceEdit_Response :=
-        (result  => (applied => Applied),
-         jsonrpc => +"2.0",
-         id      => Request,
-         error   => (Is_Set => False));
-
-      JS : aliased LSP.JSON_Streams.JSON_Stream;
-      JSON : GNATCOLL.JSON.JSON_Value;
+      Message : LSP.Messages.ApplyWorkspaceEdit_Response :=
+        (result => (applied => Applied),
+         others => <>);
    begin
-      LSP.Messages.ApplyWorkspaceEdit_Response'Write (JS'Access, Message);
-      JSON := GNATCOLL.JSON.Get (JS.Get_JSON_Document, 1);
-      Self.Send_Request (JSON.Write);
+      Self.Send_Response (Request, Message);
    end Workspace_Apply_Edit;
 
    ----------------------------------------

source/client/lsp-clients.ads

@@ -110,7 +110,7 @@ package LSP.Clients is
       Request  : out LSP.Types.LSP_Number;
       Value    : LSP.Messages.WorkspaceSymbolParams);
 
-   --  Notification sennding procedures:
+   --  Notification sending procedures:
 
    overriding procedure Workspace_Did_Change_Configuration
      (Self  : access Client;
@@ -185,4 +185,9 @@ private
       Decoder : Response_Decoder;
       Value   : in out LSP.Messages.RequestMessage'Class);
 
+   procedure Send_Response
+     (Self    : in out Client'Class;
+      Request : LSP.Types.LSP_Number_Or_String;
+      Value   : in out LSP.Messages.ResponseMessage'Class);
+
 end LSP.Clients;

source/client/lsp-raw_clients.adb

@@ -56,10 +56,10 @@ package body LSP.Raw_Clients is
    end Is_Server_Running;
 
    ------------------
-   -- Send_Request --
+   -- Send_Message --
    ------------------
 
-   procedure Send_Request
+   procedure Send_Message
      (Self : in out Raw_Client'Class;
       Text : Ada.Strings.Unbounded.Unbounded_String)
    is
@@ -75,7 +75,7 @@ package body LSP.Raw_Clients is
       if Self.Can_Write then
          Self.Listener.Standard_Input_Available;
       end if;
-   end Send_Request;
+   end Send_Message;
 
    -------------------
    -- Set_Arguments --

source/client/lsp-raw_clients.ads

@@ -67,7 +67,7 @@ package LSP.Raw_Clients is
    function Exit_Code (Self : Raw_Client'Class) return Integer;
    --  Check is LSP server is running
 
-   procedure Send_Request
+   procedure Send_Message
      (Self : in out Raw_Client'Class;
       Text : Ada.Strings.Unbounded.Unbounded_String);
    --  Send a request to LSP server. Text should contain valid JSON in