Merge pull request #321 from jammehcow/fix/319-derived-generic-attrib…

…utes fix: source generated partials when using attributes derived from ValueObjectAttribute<T>
SteveDunn · Jan 14, 2023 · 6b9328e · 6b9328e
2 parents 2b62a1d + b4e0909
commit 6b9328e
Show file tree

Hide file tree

Showing 3 changed files with 430 additions and 8 deletions.
diff --git a/src/Vogen/VoFilter.cs b/src/Vogen/VoFilter.cs
@@ -22,10 +22,11 @@ internal static class VoFilter
  public static IEnumerable<AttributeData> TryGetValueObjectAttributes(INamedTypeSymbol voSymbolInformation)
  {
  var attrs = voSymbolInformation.GetAttributes();
- 
+
  return attrs.Where(
- a => a.AttributeClass?.FullName() == "Vogen.ValueObjectAttribute"
- || a.AttributeClass?.BaseType?.FullName() == "Vogen.ValueObjectAttribute");
+ a => a.AttributeClass?.FullName() == "Vogen.ValueObjectAttribute"
+ || a.AttributeClass?.BaseType?.FullName() == "Vogen.ValueObjectAttribute"
+ || a.AttributeClass?.BaseType?.BaseType?.FullName() == "Vogen.ValueObjectAttribute");
  }
 
  // This is stage 2 in the pipeline - we filter down to just 1 target
@@ -34,16 +35,16 @@ public static IEnumerable<AttributeData> TryGetValueObjectAttributes(INamedTypeS
  var voSyntaxInformation = (TypeDeclarationSyntax) context.Node;
 
  var semanticModel = context.SemanticModel;
- 
+
  var voSymbolInformation = (INamedTypeSymbol) semanticModel.GetDeclaredSymbol(context.Node)!;
 
  var attributeData = TryGetValueObjectAttributes(voSymbolInformation).ToImmutableArray();
- 
+
  if(attributeData.Length > 0)
  {
  return new VoTarget(
  semanticModel,
- voSyntaxInformation, 
+ voSyntaxInformation,
  semanticModel.GetDeclaredSymbol(context.Node)!.ContainingType,
  voSymbolInformation,
  attributeData);
@@ -71,4 +72,4 @@ public static bool IsTarget(INamedTypeSymbol? voClass)
 
  return voAttribute is not null;
  }
-}
+}
diff --git a/tests/SnapshotTests/GenericAttributeTests.cs b/tests/SnapshotTests/GenericAttributeTests.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Shared;
 using VerifyXunit;
 using Vogen;
@@ -57,6 +57,28 @@ public partial struct CustomerId
 ");
  }
 
+ [SkippableFact]
+ public Task Produces_instances_with_derived_attribute()
+ {
+ return RunTest(@"using Vogen;
+
+namespace Whatever;
+
+public class CustomGenericAttribute : ValueObjectAttribute<int> {
+}
+
+[CustomGenericAttribute]
+[Instance(name: ""Unspecified"", value: -1, tripleSlashComment: ""a short description that'll show up in intellisense"")]
+[Instance(name: ""Unspecified1"", value: -2)]
+[Instance(name: ""Unspecified2"", value: -3, tripleSlashComment: ""<some_xml>whatever</some_xml"")]
+[Instance(name: ""Unspecified3"", value: -4)]
+[Instance(name: ""Cust42"", value: 42)]
+public partial struct CustomerId
+{
+}
+");
+ }
+
  [SkippableFact]
  public Task Validation_with_PascalCased_validate_method()
  {