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

tintoy · web-flow · commit c8cca3353760 · 2020-02-14T10:08:15.000+11:00
Correctly handle CommandOrCodeAction with missing "command" property
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>());
             }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public override CommandOrCodeAction ReadJson(JsonReader reader, Type objectType,`
`28`	`28`	`var result = JObject.Load(reader);`
`29`	`29`
`30`	`30`	`// Commands have a name, CodeActions do not`
`31`		`- if (result["command"].Type == JTokenType.String)`
	`31`	`+ JToken command = result["command"];`
	`32`	`+ if (command?.Type == JTokenType.String)`
`32`	`33`	`{`
`33`	`34`	`return new CommandOrCodeAction(result.ToObject<Command>());`
`34`	`35`	`}`