Merge pull request #58 from tintoy/fix/client-response-type

Enable client to handle array-type responses

Author: tintoy

src/Client/Protocol/ClientMessage.cs

@@ -32,12 +32,12 @@ public class ClientMessage
         ///     The request / notification message, if the message represents a request or a notification.
         /// </summary>
         [Optional]
-        public JObject Params { get; set; }
+        public JToken Params { get; set; }
 
         /// <summary>
         ///     The response message, if the message represents a response.
         /// </summary>
-        [Optional]
-        public JObject Result { get; set; }
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, NullValueHandling = NullValueHandling.Ignore)]
+        public JToken Result { get; set; }
     }
 }

src/Client/Protocol/LspConnection.cs

@@ -343,7 +343,7 @@ public void SendNotification(string method, object notification)
             {
                 // No Id means it's a notification.
                 Method = method,
-                Params = JObject.FromObject(notification, Serializer.JsonSerializer)
+                Params = JToken.FromObject(notification, Serializer.JsonSerializer)
             });
         }
 
@@ -401,7 +401,7 @@ public void SendNotification(string method, object notification)
             {
                 Id = requestId,
                 Method = method,
-                Params = request != null ? JObject.FromObject(request, Serializer.JsonSerializer) : null
+                Params = request != null ? JToken.FromObject(request, Serializer.JsonSerializer) : null
             });
 
             await responseCompletion.Task;
@@ -464,7 +464,7 @@ public void SendNotification(string method, object notification)
             {
                 Id = requestId,
                 Method = method,
-                Params = request != null ? JObject.FromObject(request, Serializer.JsonSerializer) : null
+                Params = request != null ? JToken.FromObject(request, Serializer.JsonSerializer) : null
             });
 
             ServerMessage response = await responseCompletion.Task;
@@ -899,7 +899,7 @@ private void DispatchRequest(ServerMessage requestMessage)
                     {
                         Id = requestMessage.Id,
                         Method = requestMessage.Method,
-                        Result = handlerTask.Result != null ? JObject.FromObject(handlerTask.Result, Serializer.JsonSerializer) : null
+                        Result = handlerTask.Result != null ? JToken.FromObject(handlerTask.Result, Serializer.JsonSerializer) : null
                     });
                 }