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
17 changes: 15 additions & 2 deletions src/ZeroSerializerGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private static TypeGenerationModel CreateGenerationModel(
generationModel.IsValid = false;
executionContext.ReportDiagnostic(Diagnostic.Create(
UnsupportedSerializableField,
serializableProperty.Locations.IsDefaultOrEmpty ? null : serializableProperty.Locations[0],
GetPropertyTypeLocation(serializableProperty),
serializableProperty.Name,
serializableProperty.Type.ToDisplayString()));
continue;
Expand All @@ -368,7 +368,7 @@ private static TypeGenerationModel CreateGenerationModel(
generationModel.IsValid = false;
executionContext.ReportDiagnostic(Diagnostic.Create(
InvalidBlittableArrayElement,
serializableProperty.Locations.IsDefaultOrEmpty ? null : serializableProperty.Locations[0],
GetPropertyTypeLocation(serializableProperty),
serializableProperty.Name));
continue;
}
Expand Down Expand Up @@ -790,6 +790,19 @@ private static void ReportBlittableCompatibleNestedStructDiagnostics(
return declaredType.Locations.IsDefaultOrEmpty ? null : declaredType.Locations[0];
}

private static Location? GetPropertyTypeLocation(IPropertySymbol propertySymbol)
{
foreach (SyntaxReference declaringSyntaxReference in propertySymbol.DeclaringSyntaxReferences)
{
if (declaringSyntaxReference.GetSyntax() is PropertyDeclarationSyntax propertyDeclaration)
{
return propertyDeclaration.Type.GetLocation();
}
}

return propertySymbol.Locations.IsDefaultOrEmpty ? null : propertySymbol.Locations[0];
}

private static bool TryGetPrimitiveByteCount(ITypeSymbol candidateType, out int byteCount)
{
switch (candidateType.SpecialType)
Expand Down
10 changes: 5 additions & 5 deletions tests/Diagnostics/DiagnosticTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ public struct PackedValue
[ZeroSerializer]
public class Container
{
public PackedValue {|#0:Value|} { get; set; }
public PackedValue? {|#1:OptionalValue|} { get; set; }
public {|#0:PackedValue|} Value { get; set; }
public {|#1:PackedValue?|} OptionalValue { get; set; }
}
";

Expand Down Expand Up @@ -280,7 +280,7 @@ public class UnmarkedClass
[ZeroSerializer]
public class Container
{
public UnmarkedClass {|#0:Value|} { get; set; }
public {|#0:UnmarkedClass|} Value { get; set; }
}
";

Expand Down Expand Up @@ -335,7 +335,7 @@ public struct PackedValue
[ZeroSerializer]
public class Container
{
public PackedValue[] {|#0:Values|} { get; set; }
public {|#0:PackedValue[]|} Values { get; set; }
}
";

Expand Down Expand Up @@ -389,7 +389,7 @@ public struct PackedValue
[ZeroSerializer]
public class InvalidType
{
public PackedValue {|#0:Value|} { get; set; }
public {|#0:PackedValue|} Value { get; set; }
}

[ZeroSerializer]
Expand Down
Loading