Merge pull request #92 from OmniSharp/fix/json2

fix #75

Author: david-driscoll

LSP.sln

@@ -45,6 +45,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Protocol", "src\Protocol\Pr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "src\Server\Server.csproj", "{E540868F-438E-4F7F-BBB7-010D6CB18A57}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7E4A7675-45F3-4636-88AC-2C158C1A140D}"
+	ProjectSection(SolutionItems) = preProject
+		cake.config = cake.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/Protocol/Serialization/Converters/SupportsConverter.cs

@@ -53,6 +53,11 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                     .Invoke(null, new [] { reader.Value });
             }
 
+            if (targetType == typeof(bool))
+            {
+                return new Supports<bool>(false, false);
+            }
+
             var target = serializer.Deserialize(reader, targetType);
 
             return OfValueMethod

src/Protocol/Supports.cs

@@ -5,20 +5,21 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol
 {
     public struct Supports<T> : ISupports
     {
-        public Supports(bool isSupported, T value)
+        private readonly bool? _isSupported;
+        public Supports(bool? isSupported, T value)
         {
-            IsSupported = isSupported;
+            _isSupported = isSupported;
             Value = value;
         }
 
-        public Supports(bool isSupported)
+        public Supports(bool? isSupported)
         {
-            IsSupported = isSupported;
+            _isSupported = isSupported;
             Value = default(T);
         }
 
         public T Value { get; set; }
-        public bool IsSupported { get; set; }
+        public bool IsSupported => _isSupported ?? false;
         public Type ValueType => typeof(T);
         object ISupports.Value => Value;
 
@@ -41,7 +42,7 @@ public static Supports<T> OfValue<T>(T value)
             return new Supports<T>(value != null, value);
         }
 
-        public static Supports<T> OfBoolean<T>(bool isSupported)
+        public static Supports<T> OfBoolean<T>(bool? isSupported)
         {
             return new Supports<T>(isSupported);
         }

test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs

@@ -70,5 +70,12 @@ public void SimpleTest(string expected)
             var deresult = new Serializer(ClientVersion.Lsp3).DeserializeObject<ClientCapabilities>(expected);
             deresult.Should().BeEquivalentTo(model, o => o.ConfigureForSupports(Logger));
         }
+
+        [Theory, JsonFixture]
+        public void Github_Issue_75(string expected)
+        {
+            Action a = () => JObject.Parse(expected).ToObject(typeof(ClientCapabilities), new Serializer(ClientVersion.Lsp3).JsonSerializer);
+            a.Should().NotThrow();
+        }
     }
 }

test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests_$Github_Issue_75.json

@@ -0,0 +1,12 @@
+{
+    "textDocument": {
+        "completion": {
+            "completionItem": {
+                "commitCharactersSupport": null,
+                "documentationFormat": null,
+                "snippetSupport": false
+            },
+            "dynamicRegistration": null
+        }
+    }
+}