Skip to content

Fix Attribute On Partial Reactive Property Is Duplicated #251

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
glennawatson merged 1 commit into from
Jun 10, 2025
Merged

Fix Attribute On Partial Reactive Property Is Duplicated #251

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/ReactiveUI.SourceGenerators.Execute/TestViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ public TestViewModel()
/// </value>
[Reactive]
[field: JsonInclude]
[JsonPropertyName("test")]
public partial string? PartialPropertyTest { get; set; }

/// <summary>
Expand Down
53 changes: 30 additions & 23 deletions src/ReactiveUI.SourceGenerators.Roslyn/Core/Extensions/ContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,40 @@ internal static void GetForwardedAttributes(
{
using var forwardedAttributeBuilder = ImmutableArrayBuilder<AttributeInfo>.Rent();

// Gather attributes info
foreach (var attribute in symbol.GetAttributes())
{
token.ThrowIfCancellationRequested();
var symbolAttributes = symbol.GetAttributes();

// Track the current attribute for forwarding if it is a validation attribute
if (attribute.AttributeClass?.InheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute") == true)
// if attributes contains the [Reactive] attribute, we should not forward any attributes without field targets
var isReactiveFromPartialProperty = symbol is IPropertySymbol && symbolAttributes.Any(a => a.AttributeClass?.HasFullyQualifiedMetadataName(AttributeDefinitions.ReactiveAttributeType) == true);
if (!isReactiveFromPartialProperty && symbolAttributes.Length > 1)
{
// Gather attributes info
foreach (var attribute in symbolAttributes)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
}
token.ThrowIfCancellationRequested();

// Track the current attribute for forwarding if it is a Json Serialization attribute
if (attribute.AttributeClass?.InheritsFromFullyQualifiedMetadataName("System.Text.Json.Serialization.JsonAttribute") == true)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
}
// Track the current attribute for forwarding if it is a validation attribute
if (attribute.AttributeClass?.InheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute") == true)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
}

// Also track the current attribute for forwarding if it is of any of the following types:
if (attribute.AttributeClass?.HasOrInheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.UIHintAttribute") == true ||
attribute.AttributeClass?.HasOrInheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.ScaffoldColumnAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.DisplayAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.EditableAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.KeyAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.Runtime.Serialization.DataMemberAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.Runtime.Serialization.IgnoreDataMemberAttribute") == true)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
// Track the current attribute for forwarding if it is a Json Serialization attribute
if (attribute.AttributeClass?.InheritsFromFullyQualifiedMetadataName("System.Text.Json.Serialization.JsonAttribute") == true)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
}

// Also track the current attribute for forwarding if it is of any of the following types:
if (attribute.AttributeClass?.HasOrInheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.UIHintAttribute") == true ||
attribute.AttributeClass?.HasOrInheritsFromFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.ScaffoldColumnAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.DisplayAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.EditableAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.ComponentModel.DataAnnotations.KeyAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.Runtime.Serialization.DataMemberAttribute") == true ||
attribute.AttributeClass?.HasFullyQualifiedMetadataName("System.Runtime.Serialization.IgnoreDataMemberAttribute") == true)
{
forwardedAttributeBuilder.Add(AttributeInfo.Create(attribute));
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.SourceGenerators.Roslyn/Core/Extensions/ITypeSymbolExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public static bool IsObservableReturnType(this ITypeSymbol? typeSymbol)
return false;
}

public static bool IsIShedulerType(this ITypeSymbol? typeSymbol)
public static bool IsISchedulerType(this ITypeSymbol? typeSymbol)
{
var nameFormat = SymbolDisplayFormat.FullyQualifiedFormat;
do
Expand Down
20 changes: 17 additions & 3 deletions src/ReactiveUI.SourceGenerators.Roslyn/Reactive/ReactiveGenerator.Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,16 +378,30 @@ private static string GetPropertySyntax(PropertyInfo propertyInfo)

var fieldSyntax = string.Empty;
var partialModifier = propertyInfo.IsProperty ? "partial " : string.Empty;
string propertyAttributes;

if (propertyInfo.IsProperty && propertyInfo.FieldName != "field")
{
fieldSyntax = $"private {propertyInfo.TypeNameWithNullabilityAnnotations} {propertyInfo.FieldName};";
propertyAttributes = string.Join("\n ", propertyInfo.ForwardedAttributes);
fieldSyntax =
$$"""
{{propertyAttributes}}
private {{propertyInfo.TypeNameWithNullabilityAnnotations}} {{propertyInfo.FieldName}};
""";
}

if (propertyInfo.IsProperty)
{
propertyAttributes = string.Join("\n ", AttributeDefinitions.ExcludeFromCodeCoverage);
}
else
{
propertyAttributes = string.Join("\n ", AttributeDefinitions.ExcludeFromCodeCoverage.Concat(propertyInfo.ForwardedAttributes));
}

var accessModifier = propertyInfo.PropertyAccessModifier;
var setAccessModifier = propertyInfo.SetAccessModifier;

var propertyAttributes = string.Join("\n ", AttributeDefinitions.ExcludeFromCodeCoverage.Concat(propertyInfo.ForwardedAttributes));

if (propertyInfo.IncludeMemberNotNullOnSetAccessor || propertyInfo.IsReferenceTypeOrUnconstrainedTypeParameter)
{
return
Expand Down
6 changes: 3 additions & 3 deletions src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/ReactiveCommandGenerator.Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ private static bool TryGetOutputSchedulerFromSymbol(
if (outputSchedulerSymbol is IFieldSymbol outputSchedulerFieldSymbol)
{
// The property type must always be a bool
if (!outputSchedulerFieldSymbol.Type.IsIShedulerType())
if (!outputSchedulerFieldSymbol.Type.IsISchedulerType())
{
goto Failure;
}
Expand All @@ -363,7 +363,7 @@ private static bool TryGetOutputSchedulerFromSymbol(
else if (outputSchedulerSymbol is IPropertySymbol { GetMethod: not null } outputSchedulerPropertySymbol)
{
// The property type must always be a bool
if (!outputSchedulerPropertySymbol.Type.IsIShedulerType())
if (!outputSchedulerPropertySymbol.Type.IsISchedulerType())
{
goto Failure;
}
Expand All @@ -374,7 +374,7 @@ private static bool TryGetOutputSchedulerFromSymbol(
else if (outputSchedulerSymbol is IMethodSymbol outputSchedulerMethodSymbol)
{
// The return type must always be a bool
if (!outputSchedulerMethodSymbol.ReturnType.IsIShedulerType())
if (!outputSchedulerMethodSymbol.ReturnType.IsISchedulerType())
{
goto Failure;
}
Expand Down