More serialization changes to bring the serializer everywhere. Started work on fixing tests

Author: david-driscoll

src/Client/Protocol/LspConnection.cs

@@ -14,6 +14,7 @@
 using OmniSharp.Extensions.LanguageServer.Client.Handlers;
 using OmniSharp.Extensions.LanguageServer.Client.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using JsonRpcMessages = OmniSharp.Extensions.JsonRpc.Server.Messages;
 
 namespace OmniSharp.Extensions.LanguageServer.Client.Protocol
@@ -124,6 +125,8 @@ public sealed class LspConnection
         /// </summary>
         Task _dispatchLoop;
 
+        private JsonSerializerSettings _jsonSerializerSettings;
+
         /// <summary>
         ///     Create a new <see cref="LspConnection"/>.
         /// </summary>
@@ -156,6 +159,8 @@ public LspConnection(ILoggerFactory loggerFactory, Stream input, Stream output)
             Log = loggerFactory.CreateLogger<LspConnection>();
             _input = input;
             _output = output;
+            // What does client version do? Do we have to negotaite this?
+            _jsonSerializerSettings = Serializer.CreateSerializerSettings(ClientVersion.Lsp3);
         }
 
         /// <summary>
@@ -654,7 +659,7 @@ async Task SendMessage<TMessage>(TMessage message)
             if (message == null)
                 throw new ArgumentNullException(nameof(message));
 
-            string payload = JsonConvert.SerializeObject(message);
+            string payload = JsonConvert.SerializeObject(message, _jsonSerializerSettings);
             byte[] payloadBuffer = PayloadEncoding.GetBytes(payload);
 
             byte[] headerBuffer = HeaderEncoding.GetBytes(
@@ -754,7 +759,7 @@ async Task<ServerMessage> ReceiveMessage()
             Log.LogDebug("Received entire payload ({ReceivedByteCount} bytes).", received);
 
             string responseBody = PayloadEncoding.GetString(requestBuffer);
-            ServerMessage message = JsonConvert.DeserializeObject<ServerMessage>(responseBody);
+            ServerMessage message = JsonConvert.DeserializeObject<ServerMessage>(responseBody, _jsonSerializerSettings);
 
             Log.LogDebug("Read response body {ResponseBody}.", responseBody);
 

src/JsonRpc/Client/Notification.cs

@@ -3,6 +3,7 @@
 
 namespace OmniSharp.Extensions.JsonRpc.Client
 {
+    [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
     public class Notification
     {
         public string ProtocolVersion { get; } = "2.0";

src/JsonRpc/Client/Request.cs

@@ -1,8 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.JsonRpc.Client
 {
+    [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
     public class Request
     {
         public object Id { get; set; }

src/JsonRpc/Client/Response.cs

@@ -3,6 +3,7 @@
 
 namespace OmniSharp.Extensions.JsonRpc.Client
 {
+    [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
     public class Response
     {
         public Response(object id)

src/JsonRpc/InputHandler.cs

@@ -26,6 +26,7 @@ public class InputHandler : IInputHandler
         private Thread _inputThread;
         private readonly IRequestRouter _requestRouter;
         private readonly IResponseRouter _responseRouter;
+        private readonly JsonSerializerSettings _jsonSerializerSettings;
         private readonly ILogger<InputHandler> _logger;
         private readonly IScheduler _scheduler;
 
@@ -36,7 +37,8 @@ public InputHandler(
             IRequestProcessIdentifier requestProcessIdentifier,
             IRequestRouter requestRouter,
             IResponseRouter responseRouter,
-            ILoggerFactory loggerFactory
+            ILoggerFactory loggerFactory,
+            JsonSerializerSettings jsonSerializerSettings
             )
         {
             if (!input.CanRead) throw new ArgumentException($"must provide a readable stream for {nameof(input)}", nameof(input));
@@ -46,6 +48,7 @@ ILoggerFactory loggerFactory
             _requestProcessIdentifier = requestProcessIdentifier;
             _requestRouter = requestRouter;
             _responseRouter = responseRouter;
+            _jsonSerializerSettings = jsonSerializerSettings;
             _logger = loggerFactory.CreateLogger<InputHandler>();
             _scheduler = new ProcessScheduler(loggerFactory);
             _inputThread = new Thread(ProcessInputStream) { IsBackground = true, Name = "ProcessInputStream" };
@@ -155,7 +158,7 @@ private void HandleRequest(string request)
                     }
                     else if (response is ServerError serverError)
                     {
-                        tcs.SetException(new Exception(JsonConvert.SerializeObject(serverError.Error)));
+                        tcs.SetException(new Exception(JsonConvert.SerializeObject(serverError.Error, _jsonSerializerSettings)));
                     }
                 }
 

src/JsonRpc/OutputHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.IO;
 using System.Text;
@@ -10,14 +10,16 @@ namespace OmniSharp.Extensions.JsonRpc
     public class OutputHandler : IOutputHandler
     {
         private readonly Stream _output;
+        private readonly JsonSerializerSettings _jsonSerializerSettings;
         private readonly Thread _thread;
         private readonly BlockingCollection<object> _queue;
         private readonly CancellationTokenSource _cancel;
 
-        public OutputHandler(Stream output)
+        public OutputHandler(Stream output, JsonSerializerSettings jsonSerializerSettings)
         {
             if (!output.CanWrite) throw new ArgumentException($"must provide a writable stream for {nameof(output)}", nameof(output));
             _output = output;
+            _jsonSerializerSettings = jsonSerializerSettings;
             _queue = new BlockingCollection<object>();
             _cancel = new CancellationTokenSource();
             _thread = new Thread(ProcessOutputQueue) { IsBackground = true, Name = "ProcessOutputQueue" };
@@ -42,7 +44,7 @@ private void ProcessOutputQueue()
                 {
                     if (_queue.TryTake(out var value, Timeout.Infinite, token))
                     {
-                        var content = JsonConvert.SerializeObject(value);
+                        var content = JsonConvert.SerializeObject(value, _jsonSerializerSettings);
                         var contentBytes = System.Text.Encoding.UTF8.GetBytes(content);
 
                         // TODO: Is this lsp specific??

src/Protocol/Client/Capabilities/CompletionCapability.cs

@@ -14,6 +14,6 @@ public class CompletionCapability : DynamicCapability, ConnectedCapability<IComp
         ///  The client supports to send additional context information for a `textDocument/completion` request.
         /// </summary>
         [Optional]
-        public bool? ContextSupport { get; set; }
+        public bool ContextSupport { get; set; }
     }
 }

src/Protocol/Client/Capabilities/CompletionItemCapability.cs

@@ -15,13 +15,13 @@ public class CompletionItemCapability
         /// that is typing in one will update others too.
         /// </summary>
         [Optional]
-        public bool? SnippetSupport { get; set; }
+        public bool SnippetSupport { get; set; }
 
         /// <summary>
         /// Client supports commit characters on a completion item.
         /// </summary>
         [Optional]
-        public bool? CommitCharactersSupport { get; set; }
+        public bool CommitCharactersSupport { get; set; }
 
         /// <summary>
         /// Client supports the follow content formats for the documentation

src/Protocol/Client/Capabilities/DynamicCapability.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
@@ -9,6 +9,6 @@ public class DynamicCapability
         /// Whether completion supports dynamic registration.
         /// </summary>
         [Optional]
-        public bool? DynamicRegistration { get; set; }
+        public bool DynamicRegistration { get; set; }
     }
 }

src/Protocol/Client/Capabilities/SynchronizationCapability.cs

@@ -9,20 +9,20 @@ public class SynchronizationCapability : DynamicCapability, ConnectedCapability<
         /// The client supports sending will save notifications.
         /// </summary>
         [Optional]
-        public bool? WillSave { get; set; }
+        public bool WillSave { get; set; }
 
         /// <summary>
         /// The client supports sending a will save request and
         /// waits for a response providing text edits which will
         /// be applied to the document before it is saved.
         /// </summary>
         [Optional]
-        public bool? WillSaveWaitUntil { get; set; }
+        public bool WillSaveWaitUntil { get; set; }
 
         /// <summary>
         /// The client supports did save notifications.
         /// </summary>
         [Optional]
-        public bool? DidSave { get; set; }
+        public bool DidSave { get; set; }
     }
 }