Fixed remaining tests

Author: david-driscoll

src/Protocol/Serialization/ContractResolver.cs

@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Serialization
 {
@@ -55,7 +56,6 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
             )
             {
                 property.NullValueHandling = NullValueHandling.Ignore;
-                // property.DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate;
             }
 
             if (property.DeclaringType == typeof(CompletionItem) && property.PropertyType == typeof(CompletionItemKind))

src/Protocol/Serialization/Converters/BooleanNumberStringConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;

src/Protocol/Serialization/Converters/BooleanOrConverter.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters
+{
+    class BooleanOrConverter : JsonConverter
+    {
+        private static readonly MethodInfo WriteJsonGenericMethod = typeof(BooleanOrConverter)
+            .GetTypeInfo()
+            .GetMethod(nameof(WriteJsonGeneric), BindingFlags.NonPublic | BindingFlags.Static);
+        private static readonly MethodInfo ReadJsonGenericMethod = typeof(BooleanOrConverter)
+            .GetTypeInfo()
+            .GetMethod(nameof(ReadJsonGeneric), BindingFlags.NonPublic | BindingFlags.Static);
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value == null) return;
+            WriteJsonGenericMethod.MakeGenericMethod(value.GetType().GetTypeInfo().GenericTypeArguments[0])
+                .Invoke(null, new object[] { writer, value, serializer });
+        }
+
+        private static void WriteJsonGeneric<T>(JsonWriter writer, BooleanOr<T> value, JsonSerializer serializer)
+        {
+            if (value.IsValue)
+            {
+                new JValue(value.Value).WriteTo(writer);
+                return;
+            }
+
+            if (value.IsBool && value.Bool)
+            {
+                new JValue(value.Bool).WriteTo(writer);
+                return;
+            }
+
+            writer.WriteNull();
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var parentType = objectType.GetTypeInfo().GenericTypeArguments[0];
+            return ReadJsonGenericMethod.MakeGenericMethod(parentType)
+                .Invoke(null, new object[] { reader, existingValue, serializer });
+        }
+
+        private static BooleanOr<T> ReadJsonGeneric<T>(JsonReader reader, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Boolean)
+            {
+                return new BooleanOr<T>((bool)reader.Value);
+            }
+
+            if (reader.TokenType == JsonToken.StartObject)
+            {
+                return new BooleanOr<T>(JObject.Load(reader).ToObject<T>(serializer));
+            }
+
+            return new BooleanOr<T>();
+        }
+
+        public override bool CanRead => true;
+
+        public override bool CanConvert(Type objectType) => objectType.GetTypeInfo().IsGenericType && objectType.GetTypeInfo().GetGenericTypeDefinition() == typeof(BooleanOr<>);
+    }
+}

src/Protocol/Serialization/Converters/BooleanStringConverter.cs

@@ -0,0 +1,40 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters
+{
+    class BooleanStringConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var v = value as BooleanString?;
+            if (v.HasValue)
+            {
+                new JValue(v.Value.Value).WriteTo(writer);
+            }
+            else
+            {
+                writer.WriteNull();
+            }
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            switch (reader.TokenType)
+            {
+                case JsonToken.String:
+                    return new BooleanString((string)reader.Value);
+                case JsonToken.Boolean:
+                    return new BooleanString((bool)reader.Value);
+            }
+
+            return new BooleanString();
+        }
+
+        public override bool CanRead => true;
+
+        public override bool CanConvert(Type objectType) => objectType == typeof(BooleanString);
+    }
+}

src/Protocol/Serialization/Serializer.cs

@@ -66,6 +66,8 @@ private static void AddOrReplaceConverters(ICollection<JsonConverter> converters
             ReplaceConverter(converters, new StringOrMarkupContentConverter());
             ReplaceConverter(converters, new TextDocumentSyncConverter());
             ReplaceConverter(converters, new BooleanNumberStringConverter());
+            ReplaceConverter(converters, new BooleanStringConverter());
+            ReplaceConverter(converters, new BooleanOrConverter());
             ReplaceConverter(converters, new MarkedStringsOrMarkupContentConverter());
         }
 

test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests_$EmptyTest.json renamed to test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitiesTests_$EmptyTest.json

@@ -53,5 +53,7 @@
     },
     "experimental": {
         "abc": "123"
-    }
-}
+    },
+    "typeDefinitionProvider": null,
+    "implementationProvider": null
+}

test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests_$SimpleTest.json renamed to test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitiesTests_$SimpleTest.json

@@ -78,5 +78,7 @@
             "abc": "test"
         }
     },
-    "trace": "verbose"
+    "trace": "verbose",
+    "workspaceFolders": null
 }
+

test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests_$SimpleTest.json

@@ -1,4 +1,4 @@
-{
+{
     "capabilities": {
         "textDocumentSync": {
             "openClose": true,
@@ -54,6 +54,8 @@
         },
         "experimental": {
             "abc": "123"
-        }
+        },
+        "typeDefinitionProvider": null,
+        "implementationProvider": null
     }
-}
+}