Pass serializer when calling ToObject

JoeRobich · JoeRobich · commit 3c4448eb9ded · 2023-09-20T07:34:38.000-07:00
diff --git a/src/Protocol/Features/Document/CompletionFeature.cs b/src/Protocol/Features/Document/CompletionFeature.cs
@@ -509,7 +509,7 @@ public override void WriteJson(JsonWriter writer, CompletionList? value, JsonSer
                     var items = result["items"].ToObject<IEnumerable<CompletionItem>>(serializer);
                     return new CompletionList(items, result["isIncomplete"]?.Value<bool>() ?? false)
                     {
-                        ItemDefaults = result["itemDefaults"]?.ToObject<CompletionListItemDefaults>()
+                        ItemDefaults = result["itemDefaults"]?.ToObject<CompletionListItemDefaults>(serializer)
                     };
                 }
 
diff --git a/src/Protocol/Features/Document/InlayHintFeature.cs b/src/Protocol/Features/Document/InlayHintFeature.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using MediatR;
 using Newtonsoft.Json;
@@ -231,7 +231,7 @@ public override StringOrInlayHintLabelParts ReadJson(
                     if (reader.TokenType == JsonToken.StartArray)
                     {
                         var result = JArray.Load(reader);
-                        return new StringOrInlayHintLabelParts(result.ToObject<Container<InlayHintLabelPart>>());
+                        return new StringOrInlayHintLabelParts(result.ToObject<Container<InlayHintLabelPart>>(serializer));
                     }
 
                     if (reader.TokenType == JsonToken.String)
diff --git a/src/Protocol/Features/Document/InlineValueFeature.cs b/src/Protocol/Features/Document/InlineValueFeature.cs
@@ -1,4 +1,4 @@
-﻿using System.Diagnostics;
+using System.Diagnostics;
 using MediatR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -98,7 +98,7 @@ public override InlineValueBase ReadJson(
                     {
                         return new InlineValueText()
                         {
-                            Range = result["range"]!.ToObject<Range?>()!,
+                            Range = result["range"]!.ToObject<Range?>(serializer)!,
                             Text = result["text"]!.Value<string>()!
                         };
                     }
@@ -107,15 +107,15 @@ public override InlineValueBase ReadJson(
                     {
                         return new InlineValueVariableLookup()
                         {
-                            Range = result["range"].ToObject<Range>()!,
+                            Range = result["range"].ToObject<Range>(serializer)!,
                             VariableName = result["variableName"]!.Value<string>()!,
                             CaseSensitiveLookup = result["caseSensitiveLookup"]?.Value<bool?>() ?? false,
                         };
                     }
 
                     return new InlineValueEvaluatableExpression()
                     {
-                        Range = result["range"].ToObject<Range>()!,
+                        Range = result["range"].ToObject<Range>(serializer)!,
                         Expression = result["expression"]?.Value<string>()
                     };
                 }
diff --git a/src/Protocol/Models/RangeOrEditRange.cs b/src/Protocol/Models/RangeOrEditRange.cs
@@ -46,10 +46,10 @@ public override RangeOrEditRange ReadJson(
             var obj = JObject.Load(reader);
             if (obj.ContainsKey("insert"))
             {
-                return new RangeOrEditRange(obj.ToObject<EditRange>());
+                return new RangeOrEditRange(obj.ToObject<EditRange>(serializer));
             }
 
-            return new RangeOrEditRange(obj.ToObject<Range>());
+            return new RangeOrEditRange(obj.ToObject<Range>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/CommandOrCodeActionConverter.cs b/src/Protocol/Serialization/Converters/CommandOrCodeActionConverter.cs
@@ -31,10 +31,10 @@ public override CommandOrCodeAction ReadJson(JsonReader reader, Type objectType,
             var command = result["command"];
             if (command?.Type == JTokenType.String)
             {
-                return new CommandOrCodeAction(result.ToObject<Command>());
+                return new CommandOrCodeAction(result.ToObject<Command>(serializer));
             }
 
-            return new CommandOrCodeAction(result.ToObject<CodeAction>());
+            return new CommandOrCodeAction(result.ToObject<CodeAction>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/GlobPatternConverter.cs b/src/Protocol/Serialization/Converters/GlobPatternConverter.cs
@@ -29,7 +29,7 @@ public override GlobPattern ReadJson(
 
             if (reader.TokenType == JsonToken.StartObject)
             {
-                return new GlobPattern(JObject.Load(reader).ToObject<RelativePattern>());
+                return new GlobPattern(JObject.Load(reader).ToObject<RelativePattern>(serializer));
             }
 
             return new GlobPattern("");
diff --git a/src/Protocol/Serialization/Converters/LocationOrFileLocationConverter.cs b/src/Protocol/Serialization/Converters/LocationOrFileLocationConverter.cs
@@ -19,10 +19,10 @@ public override LocationOrFileLocation ReadJson(JsonReader reader, Type objectTy
         var obj = JObject.Load(reader);
         if (obj.ContainsKey("range"))
         {
-            return new LocationOrFileLocation(obj.ToObject<Location>());
+            return new LocationOrFileLocation(obj.ToObject<Location>(serializer));
         }
 
-        return new LocationOrFileLocation(obj.ToObject<FileLocation>());
+        return new LocationOrFileLocation(obj.ToObject<FileLocation>(serializer));
     }
 
     public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/LocationOrLocationLinkConverter.cs b/src/Protocol/Serialization/Converters/LocationOrLocationLinkConverter.cs
@@ -20,10 +20,10 @@ public override LocationOrLocationLink ReadJson(JsonReader reader, Type objectTy
             var obj = JObject.Load(reader);
             if (obj.ContainsKey("uri"))
             {
-                return new LocationOrLocationLink(obj.ToObject<Location>());
+                return new LocationOrLocationLink(obj.ToObject<Location>(serializer));
             }
 
-            return new LocationOrLocationLink(obj.ToObject<LocationLink>());
+            return new LocationOrLocationLink(obj.ToObject<LocationLink>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/RangeOrPlaceholderRangeConverter.cs b/src/Protocol/Serialization/Converters/RangeOrPlaceholderRangeConverter.cs
@@ -36,13 +36,13 @@ public override void WriteJson(JsonWriter writer, RangeOrPlaceholderRange? value
             {
                 var obj = (JToken.ReadFrom(reader) as JObject)!;
                 return obj.ContainsKey("placeholder")
-                    ? new RangeOrPlaceholderRange(obj.ToObject<PlaceholderRange>())
+                    ? new RangeOrPlaceholderRange(obj.ToObject<PlaceholderRange>(serializer))
                     : obj.ContainsKey("defaultBehavior")
                         ? new RangeOrPlaceholderRange(
-                            obj.ToObject<RenameDefaultBehavior>()
+                            obj.ToObject<RenameDefaultBehavior>(serializer)
                         )
                         : new RangeOrPlaceholderRange(
-                            obj.ToObject<Range>()
+                            obj.ToObject<Range>(serializer)
                         );
             }
 
diff --git a/src/Protocol/Serialization/Converters/SemanticTokensFullOrDeltaConverter.cs b/src/Protocol/Serialization/Converters/SemanticTokensFullOrDeltaConverter.cs
@@ -30,10 +30,10 @@ public override SemanticTokensFullOrDelta ReadJson(
             var obj = JObject.Load(reader);
             if (obj.ContainsKey("data"))
             {
-                return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokens>());
+                return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokens>(serializer));
             }
 
-            return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokensDelta>());
+            return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokensDelta>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/SemanticTokensFullOrDeltaPartialResultConverter.cs b/src/Protocol/Serialization/Converters/SemanticTokensFullOrDeltaPartialResultConverter.cs
@@ -30,10 +30,10 @@ public override SemanticTokensFullOrDeltaPartialResult ReadJson(
             var obj = JObject.Load(reader);
             if (obj.ContainsKey("data"))
             {
-                return new SemanticTokensFullOrDeltaPartialResult(obj.ToObject<SemanticTokensPartialResult>());
+                return new SemanticTokensFullOrDeltaPartialResult(obj.ToObject<SemanticTokensPartialResult>(serializer));
             }
 
-            return new SemanticTokensFullOrDeltaPartialResult(obj.ToObject<SemanticTokensDeltaPartialResult>());
+            return new SemanticTokensFullOrDeltaPartialResult(obj.ToObject<SemanticTokensDeltaPartialResult>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/SymbolInformationOrDocumentSymbolConverter.cs b/src/Protocol/Serialization/Converters/SymbolInformationOrDocumentSymbolConverter.cs
@@ -32,10 +32,10 @@ public override SymbolInformationOrDocumentSymbol ReadJson(
             // SymbolInformation has property location, DocumentSymbol does not.
             if (result["location"] != null)
             {
-                return new SymbolInformationOrDocumentSymbol(result.ToObject<SymbolInformation>());
+                return new SymbolInformationOrDocumentSymbol(result.ToObject<SymbolInformation>(serializer));
             }
 
-            return new SymbolInformationOrDocumentSymbol(result.ToObject<DocumentSymbol>());
+            return new SymbolInformationOrDocumentSymbol(result.ToObject<DocumentSymbol>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/TextEditConverter.cs b/src/Protocol/Serialization/Converters/TextEditConverter.cs
@@ -31,7 +31,7 @@ public override TextEdit ReadJson(JsonReader reader, Type objectType, TextEdit e
             if (result["annotationId"] is { Type: JTokenType.String } annotation)
             {
                 edit = new AnnotatedTextEdit() {
-                    AnnotationId = annotation.ToObject<ChangeAnnotationIdentifier>()
+                    AnnotationId = annotation.ToObject<ChangeAnnotationIdentifier>(serializer)
                 };
             }
             else
@@ -41,7 +41,7 @@ public override TextEdit ReadJson(JsonReader reader, Type objectType, TextEdit e
 
             if (result["range"] is { Type: JTokenType.Object } range)
             {
-                edit = edit with { Range = range.ToObject<Range>()};
+                edit = edit with { Range = range.ToObject<Range>(serializer)};
             }
 
             if (result["newText"] is { Type: JTokenType.String } newText)
diff --git a/src/Protocol/Serialization/Converters/TextEditOrInsertReplaceEditConverter.cs b/src/Protocol/Serialization/Converters/TextEditOrInsertReplaceEditConverter.cs
@@ -31,10 +31,10 @@ public override TextEditOrInsertReplaceEdit ReadJson(JsonReader reader, Type obj
             var command = result["insert"];
             if (command?.Type == JTokenType.String)
             {
-                return new TextEditOrInsertReplaceEdit(result.ToObject<InsertReplaceEdit>());
+                return new TextEditOrInsertReplaceEdit(result.ToObject<InsertReplaceEdit>(serializer));
             }
 
-            return new TextEditOrInsertReplaceEdit(result.ToObject<TextEdit>());
+            return new TextEditOrInsertReplaceEdit(result.ToObject<TextEdit>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/ValueTupleContractResolver.cs b/src/Protocol/Serialization/Converters/ValueTupleContractResolver.cs
@@ -11,7 +11,7 @@ internal class ValueTupleContractResolver<T1, T2> : JsonConverter<(T1, T2)>
         public override (T1, T2) ReadJson(JsonReader reader, Type objectType, (T1, T2) existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             var a = JArray.Load(reader);
-            return ( a.ToObject<T1>(), a.ToObject<T2>() );
+            return ( a.ToObject<T1>(serializer), a.ToObject<T2>(serializer) );
         }
     }
 }
diff --git a/src/Protocol/Serialization/Converters/WorkspaceEditDocumentChangeConverter.cs b/src/Protocol/Serialization/Converters/WorkspaceEditDocumentChangeConverter.cs
@@ -26,17 +26,17 @@ public override WorkspaceEditDocumentChange ReadJson(
                 switch (kind)
                 {
                     case "create":
-                        return new WorkspaceEditDocumentChange(obj.ToObject<CreateFile>());
+                        return new WorkspaceEditDocumentChange(obj.ToObject<CreateFile>(serializer));
                     case "rename":
-                        return new WorkspaceEditDocumentChange(obj.ToObject<RenameFile>());
+                        return new WorkspaceEditDocumentChange(obj.ToObject<RenameFile>(serializer));
                     case "delete":
-                        return new WorkspaceEditDocumentChange(obj.ToObject<DeleteFile>());
+                        return new WorkspaceEditDocumentChange(obj.ToObject<DeleteFile>(serializer));
                     default:
                         throw new NotSupportedException("Object with " + kind + " is not supported");
                 }
             }
 
-            return new WorkspaceEditDocumentChange(obj.ToObject<TextDocumentEdit>());
+            return new WorkspaceEditDocumentChange(obj.ToObject<TextDocumentEdit>(serializer));
         }
 
         public override bool CanRead => true;
diff --git a/src/Protocol/Serialization/Converters/WorkspaceFolderOrUriConverter.cs b/src/Protocol/Serialization/Converters/WorkspaceFolderOrUriConverter.cs
@@ -32,10 +32,10 @@ public override WorkspaceFolderOrUri ReadJson(
                 var obj = JObject.Load(reader);
                 if (obj.ContainsKey("name"))
                 {
-                    return new WorkspaceFolderOrUri(obj.ToObject<WorkspaceFolder>());
+                    return new WorkspaceFolderOrUri(obj.ToObject<WorkspaceFolder>(serializer));
                 }
 
-                return new WorkspaceFolderOrUri(obj.ToObject<DocumentUri>());
+                return new WorkspaceFolderOrUri(obj.ToObject<DocumentUri>(serializer));
             }
 
             return new WorkspaceFolderOrUri("");
diff --git a/src/Server/LanguageServer.cs b/src/Server/LanguageServer.cs
@@ -419,7 +419,7 @@ out GeneralClientCapabilities generalCapabilities
                 {
                     if (request.Capabilities.SelectToken(group.Key) is JObject capabilityData)
                     {
-                        var capability = capabilityData.ToObject(capabilityType) as ICapability;
+                        var capability = capabilityData.ToObject(capabilityType, _serializer.JsonSerializer) as ICapability;
                         _supportedCapabilities.Add(capability!);
                     }
                 }
diff --git a/test/Generation.Tests/LspFeatureTests.cs b/test/Generation.Tests/LspFeatureTests.cs
@@ -358,7 +358,7 @@ public override StringOrOutlayHintLabelParts ReadJson(
                     if (reader.TokenType == JsonToken.StartArray)
                     {
                         var result = JArray.Load(reader);
-                        return new StringOrOutlayHintLabelParts(result.ToObject<Container<OutlayHintLabelPart>>());
+                        return new StringOrOutlayHintLabelParts(result.ToObject<Container<OutlayHintLabelPart>>(serializer));
                     }
 
                     if (reader.TokenType == JsonToken.String)
diff --git a/test/Lsp.Integration.Tests/ExtensionTests.cs b/test/Lsp.Integration.Tests/ExtensionTests.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Linq;
 using NSubstitute;
+using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Testing;
 using OmniSharp.Extensions.LanguageProtocol.Testing;
 using OmniSharp.Extensions.LanguageServer.Client;
@@ -67,12 +68,14 @@ public async Task Should_Support_Custom_Capabilities()
             );
 
             {
-                var capability = client.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"].ToObject<UnitTestCapability>();
+                var capability = client.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"]
+                    .ToObject<UnitTestCapability>(client.Services.GetRequiredService<ISerializer>().JsonSerializer);
                 capability.Property.Should().Be("Abcd");
             }
 
             {
-                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"].ToObject<UnitTestCapability>();
+                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"]
+                    .ToObject<UnitTestCapability>(server.Services.GetRequiredService<ISerializer>().JsonSerializer);
                 capability.Property.Should().Be("Abcd");
             }
 
@@ -127,7 +130,8 @@ public async Task Should_Support_Custom_Capabilities_Using_Json()
             );
 
             {
-                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"].ToObject<UnitTestCapability>();
+                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"]
+                    .ToObject<UnitTestCapability>(server.Services.GetRequiredService<ISerializer>().JsonSerializer);
                 capability.Property.Should().Be("Abcd");
             }
 
@@ -175,14 +179,16 @@ public async Task Should_Support_Custom_Static_Options()
             );
 
             {
-                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"].ToObject<UnitTestCapability>();
+                var capability = server.ClientSettings.Capabilities!.Workspace!.ExtensionData["unitTests"]
+                    .ToObject<UnitTestCapability>(server.Services.GetRequiredService<ISerializer>().JsonSerializer);
                 capability.Property.Should().Be("Abcd");
             }
 
             {
                 server.ServerSettings.Capabilities.ExtensionData["unitTestDiscovery"].Should().NotBeNull();
                 server.ServerSettings.Capabilities.ExtensionData["unitTestDiscovery"]
-                      .ToObject<UnitTestRegistrationOptions.StaticOptions>().SupportsDebugging.Should().BeTrue();
+                      .ToObject<UnitTestRegistrationOptions.StaticOptions>(server.Services.GetRequiredService<ISerializer>().JsonSerializer)
+                      .SupportsDebugging.Should().BeTrue();
             }
 
             {

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public override void WriteJson(JsonWriter writer, CompletionList? value, JsonSer`
`509`	`509`	`var items = result["items"].ToObject<IEnumerable<CompletionItem>>(serializer);`
`510`	`510`	`return new CompletionList(items, result["isIncomplete"]?.Value<bool>() ?? false)`
`511`	`511`	`{`
`512`		`- ItemDefaults = result["itemDefaults"]?.ToObject<CompletionListItemDefaults>()`
	`512`	`+ ItemDefaults = result["itemDefaults"]?.ToObject<CompletionListItemDefaults>(serializer)`
`513`	`513`	`};`
`514`	`514`	`}`
`515`	`515`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Collections.ObjectModel;`
	`1`	`+using System.Collections.ObjectModel;`
`2`	`2`	`using System.Diagnostics;`
`3`	`3`	`using MediatR;`
`4`	`4`	`using Newtonsoft.Json;`
`@@ -231,7 +231,7 @@ public override StringOrInlayHintLabelParts ReadJson(`
`231`	`231`	`if (reader.TokenType == JsonToken.StartArray)`
`232`	`232`	`{`
`233`	`233`	`var result = JArray.Load(reader);`
`234`		`- return new StringOrInlayHintLabelParts(result.ToObject<Container<InlayHintLabelPart>>());`
	`234`	`+ return new StringOrInlayHintLabelParts(result.ToObject<Container<InlayHintLabelPart>>(serializer));`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if (reader.TokenType == JsonToken.String)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Diagnostics;`
	`1`	`+using System.Diagnostics;`
`2`	`2`	`using MediatR;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using Newtonsoft.Json.Linq;`
`@@ -98,7 +98,7 @@ public override InlineValueBase ReadJson(`
`98`	`98`	`{`
`99`	`99`	`return new InlineValueText()`
`100`	`100`	`{`
`101`		`- Range = result["range"]!.ToObject<Range?>()!,`
	`101`	`+ Range = result["range"]!.ToObject<Range?>(serializer)!,`
`102`	`102`	`Text = result["text"]!.Value<string>()!`
`103`	`103`	`};`
`104`	`104`	`}`
`@@ -107,15 +107,15 @@ public override InlineValueBase ReadJson(`
`107`	`107`	`{`
`108`	`108`	`return new InlineValueVariableLookup()`
`109`	`109`	`{`
`110`		`- Range = result["range"].ToObject<Range>()!,`
	`110`	`+ Range = result["range"].ToObject<Range>(serializer)!,`
`111`	`111`	`VariableName = result["variableName"]!.Value<string>()!,`
`112`	`112`	`CaseSensitiveLookup = result["caseSensitiveLookup"]?.Value<bool?>() ?? false,`
`113`	`113`	`};`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`return new InlineValueEvaluatableExpression()`
`117`	`117`	`{`
`118`		`- Range = result["range"].ToObject<Range>()!,`
	`118`	`+ Range = result["range"].ToObject<Range>(serializer)!,`
`119`	`119`	`Expression = result["expression"]?.Value<string>()`
`120`	`120`	`};`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ public override RangeOrEditRange ReadJson(`
`46`	`46`	`var obj = JObject.Load(reader);`
`47`	`47`	`if (obj.ContainsKey("insert"))`
`48`	`48`	`{`
`49`		`- return new RangeOrEditRange(obj.ToObject<EditRange>());`
	`49`	`+ return new RangeOrEditRange(obj.ToObject<EditRange>(serializer));`
`50`	`50`	`}`
`51`	`51`
`52`		`- return new RangeOrEditRange(obj.ToObject<Range>());`
	`52`	`+ return new RangeOrEditRange(obj.ToObject<Range>(serializer));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public override bool CanRead => true;`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public override CommandOrCodeAction ReadJson(JsonReader reader, Type objectType,`
`31`	`31`	`var command = result["command"];`
`32`	`32`	`if (command?.Type == JTokenType.String)`
`33`	`33`	`{`
`34`		`- return new CommandOrCodeAction(result.ToObject<Command>());`
	`34`	`+ return new CommandOrCodeAction(result.ToObject<Command>(serializer));`
`35`	`35`	`}`
`36`	`36`
`37`		`- return new CommandOrCodeAction(result.ToObject<CodeAction>());`
	`37`	`+ return new CommandOrCodeAction(result.ToObject<CodeAction>(serializer));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public override bool CanRead => true;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override GlobPattern ReadJson(`
`29`	`29`
`30`	`30`	`if (reader.TokenType == JsonToken.StartObject)`
`31`	`31`	`{`
`32`		`- return new GlobPattern(JObject.Load(reader).ToObject<RelativePattern>());`
	`32`	`+ return new GlobPattern(JObject.Load(reader).ToObject<RelativePattern>(serializer));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`return new GlobPattern("");`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ public override LocationOrFileLocation ReadJson(JsonReader reader, Type objectTy`
`19`	`19`	`var obj = JObject.Load(reader);`
`20`	`20`	`if (obj.ContainsKey("range"))`
`21`	`21`	`{`
`22`		`- return new LocationOrFileLocation(obj.ToObject<Location>());`
	`22`	`+ return new LocationOrFileLocation(obj.ToObject<Location>(serializer));`
`23`	`23`	`}`
`24`	`24`
`25`		`- return new LocationOrFileLocation(obj.ToObject<FileLocation>());`
	`25`	`+ return new LocationOrFileLocation(obj.ToObject<FileLocation>(serializer));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public override bool CanRead => true;`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ public override LocationOrLocationLink ReadJson(JsonReader reader, Type objectTy`
`20`	`20`	`var obj = JObject.Load(reader);`
`21`	`21`	`if (obj.ContainsKey("uri"))`
`22`	`22`	`{`
`23`		`- return new LocationOrLocationLink(obj.ToObject<Location>());`
	`23`	`+ return new LocationOrLocationLink(obj.ToObject<Location>(serializer));`
`24`	`24`	`}`
`25`	`25`
`26`		`- return new LocationOrLocationLink(obj.ToObject<LocationLink>());`
	`26`	`+ return new LocationOrLocationLink(obj.ToObject<LocationLink>(serializer));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override bool CanRead => true;`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ public override void WriteJson(JsonWriter writer, RangeOrPlaceholderRange? value`
`36`	`36`	`{`
`37`	`37`	`var obj = (JToken.ReadFrom(reader) as JObject)!;`
`38`	`38`	`return obj.ContainsKey("placeholder")`
`39`		`- ? new RangeOrPlaceholderRange(obj.ToObject<PlaceholderRange>())`
	`39`	`+ ? new RangeOrPlaceholderRange(obj.ToObject<PlaceholderRange>(serializer))`
`40`	`40`	`: obj.ContainsKey("defaultBehavior")`
`41`	`41`	`? new RangeOrPlaceholderRange(`
`42`		`- obj.ToObject<RenameDefaultBehavior>()`
	`42`	`+ obj.ToObject<RenameDefaultBehavior>(serializer)`
`43`	`43`	`)`
`44`	`44`	`: new RangeOrPlaceholderRange(`
`45`		`- obj.ToObject<Range>()`
	`45`	`+ obj.ToObject<Range>(serializer)`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ public override SemanticTokensFullOrDelta ReadJson(`
`30`	`30`	`var obj = JObject.Load(reader);`
`31`	`31`	`if (obj.ContainsKey("data"))`
`32`	`32`	`{`
`33`		`- return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokens>());`
	`33`	`+ return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokens>(serializer));`
`34`	`34`	`}`
`35`	`35`
`36`		`- return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokensDelta>());`
	`36`	`+ return new SemanticTokensFullOrDelta(obj.ToObject<SemanticTokensDelta>(serializer));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public override bool CanRead => true;`