Merge pull request #211 from tintoy/bug/command-or-code-action

Correctly handle CommandOrCodeAction with missing "command" property
OmniSharp · Feb 13, 2020 · c8cca33 · c8cca33
2 parents c4fbf34 + b622baa
commit c8cca33
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Protocol/Serialization/Converters/CommandOrCodeActionConverter.cs b/src/Protocol/Serialization/Converters/CommandOrCodeActionConverter.cs
@@ -28,7 +28,8 @@ public override CommandOrCodeAction ReadJson(JsonReader reader, Type objectType,
             var result = JObject.Load(reader);
 
             // Commands have a name, CodeActions do not
-            if (result["command"].Type == JTokenType.String)
+            JToken command = result["command"];
+            if (command?.Type == JTokenType.String)
             {
                 return new CommandOrCodeAction(result.ToObject<Command>());
             }