Skip to content

Fix PreferTheJsonConverterAttribute when factory is specified in the attribute #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomasherceg merged 1 commit into from
Dec 30, 2025
Merged

Fix PreferTheJsonConverterAttribute when factory is specified in the attribute #1981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Framework/Framework/ViewModel/Serialization/PreferTheJsonConverterAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ public override bool CanConvert(Type typeToConvert)
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
var attr = typeToConvert.GetCustomAttribute<JsonConverterAttribute>(inherit: false)!;
if (attr.CreateConverter(typeToConvert) is {} converter)
return converter;
if (attr.ConverterType is null)
throw new Exception($"Type {typeToConvert.ToCode()} has a [JsonConverter] attribute, but its CreateConverter returns null sometimes?");
return (JsonConverter)Activator.CreateInstance(attr.ConverterType)!;
var converter = attr.CreateConverter(typeToConvert);
if (converter is null)
{
if (attr.ConverterType is null)
throw new Exception($"Type {typeToConvert.ToCode()} has a [JsonConverter] attribute, but its CreateConverter returns null sometimes?");
converter = (JsonConverter)Activator.CreateInstance(attr.ConverterType)!;
}

if (converter is JsonConverterFactory factory)
return factory.CreateConverter(typeToConvert, options);
return converter;
}
}
}
Expand Down
Loading