Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ private void ProcessTypeCustomAttributes(
List<DerivedTypeSpec>? derivedTypes = null;
HashSet<object>? typeDiscriminators = null;
bool hasExplicitDerivedTypeAttribute = false;
bool hasUnionTypeClassifierSpecified = false;
bool hasUnionTypeClassifierSpecified = options?.TypeClassifiers is { Count: > 0 };
bool isUnionType = IsUnionType(typeToGenerate.Type);
INamedTypeSymbol? namedUnionType = typeToGenerate.Type as INamedTypeSymbol;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ public override JsonTypeClassifier CreateJsonClassifier(JsonTypeClassifierContex
}

[Fact]
public void UnionWithAmbiguousCaseTypesAndOptionsClassifier_CompilesWithWarning()
public void UnionWithAmbiguousCaseTypesAndOptionsClassifier_CompilesWithoutWarning()
{
string source = """
using System;
Expand Down Expand Up @@ -815,14 +815,8 @@ public override JsonTypeClassifier CreateJsonClassifier(JsonTypeClassifierContex

Compilation compilation = CompilationHelper.CreateCompilation(source);
JsonSourceGeneratorResult result = CompilationHelper.RunJsonSourceGenerator(compilation, disableDiagnosticValidation: true);
Location unionLocation = compilation.GetSymbolsWithName("IntOrLongUnion").First().Locations[0];

var expectedDiagnostics = new DiagnosticData[]
{
new(DiagnosticSeverity.Warning, unionLocation, "Union type 'IntOrLongUnion': case types 'int', 'long' all serialize as JSON value type 'Number'. Set JsonUnionAttribute.TypeClassifier to provide a custom classifier that can disambiguate."),
};

CompilationHelper.AssertEqualDiagnosticMessages(expectedDiagnostics, result.Diagnostics);
Assert.Empty(result.Diagnostics);
}

[Fact]
Expand Down
Loading