Merge branch 'main' into CP_FixTargetInfoToAllowGenericTypes

Author: ChrisPulman

README.md

@@ -389,6 +389,23 @@ The class must inherit from a UI Control from any of the following platforms and
 - Avalonia (Avalonia)
 - Uno (Windows.UI.Xaml).
 
+### Usage IViewFor with ViewModel Name - Generic Types should be used with the fully qualified name, otherwise use nameof(ViewModelTypeName)
+```csharp
+using ReactiveUI.SourceGenerators;
+
+[IViewFor("MyReactiveGenericClass<int>")]
+public partial class MyReactiveControl : UserControl
+{
+    public MyReactiveControl()
+    {
+        InitializeComponent();
+        MyReactiveClass = new MyReactiveClass();
+    }
+}
+```
+
+### Usage IViewFor with ViewModel Type
+
 ```csharp
 using ReactiveUI.SourceGenerators;
 

src/ReactiveUI.SourceGenerators/AttributeDefinitions.cs

@@ -207,6 +207,18 @@ namespace ReactiveUI.SourceGenerators;
 [global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.IViewForGenerator", "1.1.0.0")]
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
 internal sealed class IViewForAttribute<T> : Attribute;
+
+/// <summary>
+/// IViewForAttribute.
+/// </summary>
+/// <seealso cref="System.Attribute" />
+/// <remarks>
+/// Initializes a new instance of the <see cref="IViewForAttribute"/> class.
+/// </remarks>
+/// <param name="viewModelType">Type of the view model.</param>
+[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.IViewForGenerator", "1.1.0.0")]
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+internal sealed class IViewForAttribute(string? viewModelType) : Attribute;
 #nullable restore
 #pragma warning restore
 """;

src/ReactiveUI.SourceGenerators/IViewFor/IViewForGenerator.Execute.cs

@@ -50,20 +50,15 @@ public partial class IViewForGenerator
 
         token.ThrowIfCancellationRequested();
 
+        var constructorArgument = attributeData.GetConstructorArguments<string>().FirstOrDefault();
         var genericArgument = attributeData.GetGenericType();
         token.ThrowIfCancellationRequested();
-        if (!(genericArgument is string viewModelTypeName && viewModelTypeName.Length > 0))
+        var viewModelTypeName = string.IsNullOrWhiteSpace(constructorArgument) ? genericArgument : constructorArgument;
+        if (string.IsNullOrWhiteSpace(viewModelTypeName))
         {
             return default;
         }
 
-        var compilation = context.SemanticModel.Compilation;
-        var semanticModel = compilation.GetSemanticModel(context.SemanticModel.SyntaxTree);
-        token.ThrowIfCancellationRequested();
-        attributeData.GatherForwardedAttributesFromClass(semanticModel, declaredClass, token, out var classAttributesInfo);
-        var forwardedClassAttributes = classAttributesInfo.Select(static a => a.ToString())
-            .Where(x => !x.Contains(AttributeDefinitions.IViewForAttributeType))
-            .ToImmutableArray();
         token.ThrowIfCancellationRequested();
 
         var viewForBaseType = IViewForBaseType.None;
@@ -105,14 +100,13 @@ public partial class IViewForGenerator
             targetInfo.TargetVisibility,
             targetInfo.TargetType,
             viewModelTypeName!,
-            viewForBaseType,
-            forwardedClassAttributes);
+            viewForBaseType);
     }
 
     private static string GenerateSource(string containingTypeName, string containingNamespace, string containingClassVisibility, string containingType, IViewForInfo iviewForInfo)
     {
         // Prepare any forwarded property attributes
-        var forwardedAttributesString = string.Join("\n        ", excludeFromCodeCoverage.Concat(iviewForInfo.ForwardedAttributes));
+        var forwardedAttributesString = string.Join("\n        ", excludeFromCodeCoverage);
 
         switch (iviewForInfo.BaseType)
         {

src/ReactiveUI.SourceGenerators/IViewFor/Models/IViewForInfo.cs

@@ -18,5 +18,4 @@ internal sealed record IViewForInfo(
     string TargetVisibility,
     string TargetType,
     string ViewModelTypeName,
-    IViewForBaseType BaseType,
-    EquatableArray<string> ForwardedAttributes);
+    IViewForBaseType BaseType);