Skip to content

Fix support for classes implementing IReactiveObject without inheriting from ReactiveObject #225

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
merged 1 commit into from
Apr 24, 2025
Merged

Fix support for classes implementing IReactiveObject without inheriting from ReactiveObject #225

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
4 changes: 2 additions & 2 deletions src/ReactiveUI.SourceGenerators.Analyzers.CodeFixes/Core/Extensions/FieldSyntaxExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal static class FieldSyntaxExtensions
internal static bool IsTargetTypeValid(this IFieldSymbol fieldSymbol)
{
var isObservableObject = fieldSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.ReactiveObject");
var isIObservableObject = fieldSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var isIObservableObject = fieldSymbol.ContainingType.ImplementsFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var hasObservableObjectAttribute = fieldSymbol.ContainingType.HasOrInheritsAttributeWithFullyQualifiedMetadataName("ReactiveUI.SourceGenerators.ReactiveObjectAttribute");

return isIObservableObject || isObservableObject || hasObservableObjectAttribute;
Expand All @@ -31,7 +31,7 @@ internal static bool IsTargetTypeValid(this IFieldSymbol fieldSymbol)
internal static bool IsTargetTypeValid(this IPropertySymbol propertySymbol)
{
var isObservableObject = propertySymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.ReactiveObject");
var isIObservableObject = propertySymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var isIObservableObject = propertySymbol.ContainingType.ImplementsFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var hasObservableObjectAttribute = propertySymbol.ContainingType.HasOrInheritsAttributeWithFullyQualifiedMetadataName("ReactiveUI.SourceGenerators.ReactiveObjectAttribute");

return isIObservableObject || isObservableObject || hasObservableObjectAttribute;
Expand Down
19 changes: 19 additions & 0 deletions src/ReactiveUI.SourceGenerators.Analyzers.CodeFixes/Core/Extensions/ITypeSymbolExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,25 @@ public static bool InheritsFromFullyQualifiedMetadataName(this ITypeSymbol typeS
return false;
}

/// <summary>
/// Checks whether or not a given <see cref="ITypeSymbol"/> implements a specified interface.
/// </summary>
/// <param name="typeSymbol">The target <see cref="ITypeSymbol"/> instance to check.</param>
/// <param name="name">The full name of the interface to check for inheritance.</param>
/// <returns>Whether or not <paramref name="typeSymbol"/> implements <paramref name="name"/>.</returns>
public static bool ImplementsFullyQualifiedMetadataName(this ITypeSymbol typeSymbol, string name)
{
foreach (var implementedInterface in typeSymbol.AllInterfaces)
{
if (implementedInterface.HasFullyQualifiedMetadataName(name))
{
return true;
}
}

return false;
}

/// <summary>
/// Checks whether or not a given <see cref="ITypeSymbol"/> has or inherits a specified attribute.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/ReactiveUI.SourceGenerators.Roslyn/Core/Extensions/FieldSyntaxExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ internal static void GetNullabilityInfo(
internal static bool IsTargetTypeValid(this IFieldSymbol fieldSymbol)
{
var isObservableObject = fieldSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.ReactiveObject");
var isIObservableObject = fieldSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var isIObservableObject = fieldSymbol.ContainingType.ImplementsFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var hasObservableObjectAttribute = fieldSymbol.ContainingType.HasOrInheritsAttributeWithFullyQualifiedMetadataName("ReactiveUI.SourceGenerators.ReactiveObjectAttribute");

return isIObservableObject || isObservableObject || hasObservableObjectAttribute;
Expand All @@ -137,7 +137,7 @@ internal static bool IsTargetTypeValid(this IFieldSymbol fieldSymbol)
internal static bool IsTargetTypeValid(this IPropertySymbol propertySymbol)
{
var isObservableObject = propertySymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.ReactiveObject");
var isIObservableObject = propertySymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var isIObservableObject = propertySymbol.ContainingType.ImplementsFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var hasObservableObjectAttribute = propertySymbol.ContainingType.HasOrInheritsAttributeWithFullyQualifiedMetadataName("ReactiveUI.SourceGenerators.ReactiveObjectAttribute");

return isIObservableObject || isObservableObject || hasObservableObjectAttribute;
Expand All @@ -151,7 +151,7 @@ internal static bool IsTargetTypeValid(this IPropertySymbol propertySymbol)
internal static bool IsTargetTypeValid(this IMethodSymbol methodSymbol)
{
var isObservableObject = methodSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.ReactiveObject");
var isIObservableObject = methodSymbol.ContainingType.InheritsFromFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var isIObservableObject = methodSymbol.ContainingType.ImplementsFullyQualifiedMetadataName("ReactiveUI.IReactiveObject");
var hasObservableObjectAttribute = methodSymbol.ContainingType.HasOrInheritsAttributeWithFullyQualifiedMetadataName("ReactiveUI.SourceGenerators.ReactiveObjectAttribute");

return isIObservableObject || isObservableObject || hasObservableObjectAttribute;
Expand Down
19 changes: 19 additions & 0 deletions 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 @@ -56,6 +56,25 @@ public static bool InheritsFromFullyQualifiedMetadataName(this ITypeSymbol typeS
return false;
}

/// <summary>
/// Checks whether or not a given <see cref="ITypeSymbol"/> implements a specified interface.
/// </summary>
/// <param name="typeSymbol">The target <see cref="ITypeSymbol"/> instance to check.</param>
/// <param name="name">The full name of the interface to check for inheritance.</param>
/// <returns>Whether or not <paramref name="typeSymbol"/> implements <paramref name="name"/>.</returns>
public static bool ImplementsFullyQualifiedMetadataName(this ITypeSymbol typeSymbol, string name)
{
foreach (var implementedInterface in typeSymbol.AllInterfaces)
{
if (implementedInterface.HasFullyQualifiedMetadataName(name))
{
return true;
}
}

return false;
}

/// <summary>
/// Checks whether or not a given <see cref="ITypeSymbol"/> has or inherits from a specified type.
/// </summary>
Expand Down
Loading