couple more updates

Author: david-driscoll

src/Protocol/Client/Capabilities/CompletionCapability.cs

@@ -8,6 +8,7 @@ public class CompletionCapability : DynamicCapability, ConnectedCapability<IComp
         /// The client supports the following `CompletionItem` specific
         /// capabilities.
         /// </summary>
+        [Optional]
         public CompletionItemCapability CompletionItem { get; set; }
 
         /// <summary>

src/Protocol/Models/CodeLens.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
@@ -28,6 +29,6 @@ public class CodeLens
         /// a code lens and a code lens resolve request.
         /// </summary>
         [Optional]
-        public object Data { get; set; }
+        public JObject Data { get; set; }
     }
 }

src/Protocol/Serialization/Converters/StringOrMarkupContentConverter.cs

@@ -16,12 +16,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             }
             else
             {
-                writer.WriteStartObject();
-                writer.WritePropertyName("kind");
-                writer.WriteValue(v.MarkupContent.Kind);
-                writer.WritePropertyName("value");
-                writer.WriteValue(v.MarkupContent.Value);
-                writer.WriteEndObject();
+                serializer.Serialize(writer, v.MarkupContent);
             }
         }
 
@@ -49,4 +44,44 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
         public override bool CanConvert(Type objectType) => objectType == typeof(StringOrMarkupContent);
     }
+
+    public class MarkedStringsOrMarkupContentConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var v = value as MarkedStringsOrMarkupContent;
+            if (v.HasMarkupContent)
+            {
+                serializer.Serialize(writer, v.MarkupContent);
+            }
+            else
+            {
+                serializer.Serialize(writer, v.MarkedStrings);
+            }
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.StartObject)
+            {
+                var result = JObject.Load(reader);
+                return new MarkedStringsOrMarkupContent(result.ToObject<MarkupContent>(serializer));
+            }
+            if (reader.TokenType == JsonToken.StartArray)
+            {
+                var result = JArray.Load(reader);
+                return new MarkedStringsOrMarkupContent(result.ToObject<MarkedStringContainer>(serializer));
+            }
+            if (reader.TokenType == JsonToken.String)
+            {
+                return new MarkedStringsOrMarkupContent(reader.Value as string);
+            }
+
+            return "";
+        }
+
+        public override bool CanRead => true;
+
+        public override bool CanConvert(Type objectType) => objectType == typeof(MarkedStringsOrMarkupContent);
+    }
 }

src/Protocol/Serialization/Serializer.cs

@@ -13,20 +13,21 @@ public static class Serializer
     {
         public static JsonSerializer CreateSerializer(ClientVersion version)
         {
-            var serialzier = JsonSerializer.CreateDefault();
-            serialzier.ContractResolver = new ContractResolver();
+            var serializer = JsonSerializer.CreateDefault();
+            serializer.ContractResolver = new ContractResolver();
 
-            serialzier.Converters.Add(new SupportsConverter());
-            serialzier.Converters.Add(new CompletionListConverter());
-            serialzier.Converters.Add(new DiagnosticCodeConverter());
-            serialzier.Converters.Add(new LocationOrLocationsConverter());
-            serialzier.Converters.Add(new MarkedStringCollectionConverter());
-            serialzier.Converters.Add(new MarkedStringConverter());
-            serialzier.Converters.Add(new StringOrMarkupContentConverter());
-            serialzier.Converters.Add(new TextDocumentSyncConverter());
-            serialzier.Converters.Add(new BooleanNumberStringConverter());
+            serializer.Converters.Add(new SupportsConverter());
+            serializer.Converters.Add(new CompletionListConverter());
+            serializer.Converters.Add(new DiagnosticCodeConverter());
+            serializer.Converters.Add(new LocationOrLocationsConverter());
+            serializer.Converters.Add(new MarkedStringCollectionConverter());
+            serializer.Converters.Add(new MarkedStringConverter());
+            serializer.Converters.Add(new StringOrMarkupContentConverter());
+            serializer.Converters.Add(new TextDocumentSyncConverter());
+            serializer.Converters.Add(new BooleanNumberStringConverter());
+            serializer.Converters.Add(new MarkedStringsOrMarkupContentConverter());
 
-            return serialzier;
+            return serializer;
         }
 
         public static JsonSerializerSettings CreateSerializerSettings(ClientVersion version)
@@ -44,6 +45,7 @@ public static JsonSerializerSettings CreateSerializerSettings(ClientVersion vers
             settings.Converters.Add(new StringOrMarkupContentConverter());
             settings.Converters.Add(new TextDocumentSyncConverter());
             settings.Converters.Add(new BooleanNumberStringConverter());
+            settings.Converters.Add(new MarkedStringsOrMarkupContentConverter());
 
             return settings;
         }
@@ -83,7 +85,7 @@ protected override JsonObjectContract CreateObjectContract(Type objectType)
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
             var property = base.CreateProperty(member, memberSerialization);
-            if (property.DeclaringType.Name.EndsWith("Capability")) return property;
+            //if (property.DeclaringType.Name.EndsWith("Capability")) return property;
             // if (property.PropertyType.GetTypeInfo().IsGenericType)
                 if (
                    member.GetCustomAttributes<OptionalAttribute>().Any()

test/Lsp.Tests/Models/CodeLensTests.cs

@@ -21,10 +21,10 @@ public void SimpleTest(string expected)
                     Name = "abc",
                     Title = "Cool story bro"
                 },
-                Data = new Dictionary<string, object>()
+                Data = JObject.FromObject(new Dictionary<string, object>()
                 {
                     { "somethingCool" , 1 }
-                },
+                }),
                 Range = new Range(new Position(1, 2), new Position(2, 3)),
             };
             var result = Fixture.SerializeObject(model);