Add support for [element: ] attributes on record parameters

viceroypenguin · viceroypenguin · commit 444204709809 · 2025-08-27T16:47:56.000-05:00
diff --git a/src/Common/ITypeSymbolExtensions.cs b/src/Common/ITypeSymbolExtensions.cs
@@ -329,15 +329,12 @@ SemanticModel semanticModel
 
 				foreach (var attributeList in parameterSyntax.AttributeLists)
 				{
-					var target = attributeList.Target?.Identifier.ValueText;
-
-					if (target is not "property")
-						continue;
+					var target = attributeList.Target?.Identifier.ValueText.NullIf("property");
 
 					foreach (var attribute in attributeList.Attributes)
 					{
 						if (semanticModel.GetOperation(attribute) is IAttributeOperation { Operation: IObjectCreationOperation operation })
-							list.Add((null, operation));
+							list.Add((target, operation));
 					}
 				}
 
diff --git a/src/Immediate.Validations.Analyzers/InvalidAttributeTargetSuppressor.cs b/src/Immediate.Validations.Analyzers/InvalidAttributeTargetSuppressor.cs
@@ -29,23 +29,31 @@ public override void ReportSuppressions(SuppressionAnalysisContext context)
 
 			if (syntaxTree
 					?.GetRoot(token)
-					.FindNode(diagnostic.Location.SourceSpan) is
-					not AttributeTargetSpecifierSyntax
+					.FindNode(diagnostic.Location.SourceSpan) is not AttributeTargetSpecifierSyntax
 					{
 						Identifier.ValueText: "element",
-						Parent.Parent: PropertyDeclarationSyntax propertyDeclarationSyntax
+						Parent.Parent: SyntaxNode declarationSyntax
 					})
 			{
 				continue;
 			}
 
-			if (context.GetSemanticModel(syntaxTree)
-					.GetDeclaredSymbol(propertyDeclarationSyntax, token) is
-					not IPropertySymbol
-					{
-						ContainingType: INamedTypeSymbol containerSymbol,
-						Type: ITypeSymbol propertyTypeSymbol
-					})
+			if (context.GetSemanticModel(syntaxTree).GetDeclaredSymbol(declarationSyntax, token) switch
+			{
+				IPropertySymbol
+				{
+					ContainingType: INamedTypeSymbol ct1,
+					Type: ITypeSymbol pt1
+				} => (true, ct1, pt1),
+
+				IParameterSymbol
+				{
+					ContainingType: INamedTypeSymbol ct1,
+					Type: ITypeSymbol pt1
+				} => (true, ct1, pt1),
+
+				_ => (false, null, null),
+			} is not (true, { } containerSymbol, { } propertyTypeSymbol))
 			{
 				continue;
 			}
@@ -79,6 +87,8 @@ not IPropertySymbol
 					diagnostic
 				)
 			);
+
+			break;
 		}
 	}
 }
diff --git a/tests/Immediate.Validations.Tests/AnalyzerTests/InvalidAttributeTargetSuppressorTests.cs b/tests/Immediate.Validations.Tests/AnalyzerTests/InvalidAttributeTargetSuppressorTests.cs
@@ -8,6 +8,36 @@ public sealed class InvalidAttributeTargetSuppressorTests
 	public static readonly DiagnosticResult CS0658 =
 		DiagnosticResult.CompilerWarning("CS0658");
 
+	[Fact]
+	public async Task ElementAttributeInValidatorListForParameterIsSuppressed() =>
+		await AnalyzerTestHelpers
+			.CreateSuppressorTest<InvalidAttributeTargetSuppressor>(
+				"""
+				#nullable enable
+
+				using System.Collections.Generic;
+				using Immediate.Validations.Shared;
+			
+				[Validate]
+				public record Target(
+					[{|#0:element|}: MaxLength(3)]
+					List<string> Strings
+				): IValidationTarget<Target>
+				{
+				
+					public ValidationResult Validate() => [];
+					public ValidationResult Validate(ValidationResult errors) => [];
+					public static ValidationResult Validate(Target target) => [];
+					public static ValidationResult Validate(Target target, ValidationResult errors) => [];
+				}
+				"""
+			)
+			.WithSpecificDiagnostics([CS0658])
+			.WithExpectedDiagnosticsResults([
+				CS0658.WithLocation(0).WithIsSuppressed(true),
+			])
+			.RunAsync(TestContext.Current.CancellationToken);
+
 	[Fact]
 	public async Task ElementAttributeInValidatorListIsSuppressed() =>
 		await AnalyzerTestHelpers
diff --git a/tests/Immediate.Validations.Tests/GeneratorTests/MiscellaneousTests.PropertyValidationOnRecord#IV...ValidateClass.g.verified.cs b/tests/Immediate.Validations.Tests/GeneratorTests/MiscellaneousTests.PropertyValidationOnRecord#IV...ValidateClass.g.verified.cs
@@ -37,27 +37,28 @@ public static  ValidationResult Validate(ValidateClass? target, ValidationResult
 			return errors;
 		
 
-		__ValidateTesting(errors, t, t.Testing);
+		__ValidateTesting1(errors, t, t.Testing1);
+		__Validatedata(errors, t, t.data);
 
 
 		return errors;
 	}
 
 
 
-	private static void __ValidateTesting(
+	private static void __ValidateTesting1(
 		ValidationResult errors, ValidateClass instance, string target
 	)
 	{
 
 		if (target is not { } t)
 		{
 			errors.Add(
-				$"Testing",
+				$"Testing1",
 				global::Immediate.Validations.Shared.NotNullAttribute.DefaultMessage,
 				new()
 				{
-					["PropertyName"] = $"Testing",
+					["PropertyName"] = $"Testing1",
 					["PropertyValue"] = null,
 				}
 			);
@@ -75,11 +76,11 @@ private static void __ValidateTesting(
 			)
 			{
 				errors.Add(
-					$"Testing",
+					$"Testing1",
 					global::Immediate.Validations.Shared.MaxLengthAttribute.DefaultMessage,
 					new()
 					{
-						["PropertyName"] = $"Testing",
+						["PropertyName"] = $"Testing1",
 						["PropertyValue"] = t,
 						["MaxLengthName"] = "",
 						["MaxLengthValue"] = 3,
@@ -89,5 +90,85 @@ private static void __ValidateTesting(
 		}
 	}
 
+	private static void __Validatedata0(
+		ValidationResult errors, ValidateClass instance, int target, int counter0
+	)
+	{
+
+		var t = target;
+
+
+
+		{
+			if (!global::Immediate.Validations.Shared.GreaterThanAttribute.ValidateProperty(
+					t
+					, comparison: 0
+				)
+			)
+			{
+				errors.Add(
+					$"data[{counter0}]",
+					global::Immediate.Validations.Shared.GreaterThanAttribute.DefaultMessage,
+					new()
+					{
+						["PropertyName"] = $"data[{counter0}]",
+						["PropertyValue"] = t,
+						["ComparisonName"] = "",
+						["ComparisonValue"] = 0,
+					}
+				);
+			}
+		}
+	}
+
+	private static void __Validatedata(
+		ValidationResult errors, ValidateClass instance, global::System.Collections.Generic.List<int> target
+	)
+	{
+
+		if (target is not { } t)
+		{
+			errors.Add(
+				$"data",
+				global::Immediate.Validations.Shared.NotNullAttribute.DefaultMessage,
+				new()
+				{
+					["PropertyName"] = $"data",
+					["PropertyValue"] = null,
+				}
+			);
+
+			return;
+		}
+
+
+		var counter0 = 0;
+		foreach (var item0 in t)
+		{
+			__Validatedata0(
+				errors, instance, item0, counter0
+			);
+			counter0++;
+		}
+
+		{
+			if (!global::Immediate.Validations.Shared.NotEmptyAttribute.ValidateProperty(
+					t
+				)
+			)
+			{
+				errors.Add(
+					$"data",
+					global::Immediate.Validations.Shared.NotEmptyAttribute.DefaultMessage,
+					new()
+					{
+						["PropertyName"] = $"data",
+						["PropertyValue"] = t,
+					}
+				);
+			}
+		}
+	}
+
 }
 
diff --git a/tests/Immediate.Validations.Tests/GeneratorTests/MiscellaneousTests.cs b/tests/Immediate.Validations.Tests/GeneratorTests/MiscellaneousTests.cs
@@ -8,11 +8,17 @@ public async Task PropertyValidationOnRecord()
 		var result = GeneratorTestHelper.RunGenerator(
 			"""
 			using System.ComponentModel;
+			using System.Collections.Generic;
 			using Immediate.Validations.Shared;
 
 			[Validate]
 			public sealed partial record ValidateClass(
-				[property: MaxLength(3)] string Testing
+				[property: MaxLength(3)]
+				string Testing1,
+
+				[property: NotEmpty]
+				[element: GreaterThan(0)]
+				List<int> data
 			): IValidationTarget<ValidateClass>;
 			"""
 		);

Original file line number	Diff line number	Diff line change
`@@ -329,15 +329,12 @@ SemanticModel semanticModel`
`329`	`329`
`330`	`330`	`foreach (var attributeList in parameterSyntax.AttributeLists)`
`331`	`331`	`{`
`332`		`- var target = attributeList.Target?.Identifier.ValueText;`
`333`		`-`
`334`		`- if (target is not "property")`
`335`		`- continue;`
	`332`	`+ var target = attributeList.Target?.Identifier.ValueText.NullIf("property");`
`336`	`333`
`337`	`334`	`foreach (var attribute in attributeList.Attributes)`
`338`	`335`	`{`
`339`	`336`	`if (semanticModel.GetOperation(attribute) is IAttributeOperation { Operation: IObjectCreationOperation operation })`
`340`		`- list.Add((null, operation));`
	`337`	`+ list.Add((target, operation));`
`341`	`338`	`}`
`342`	`339`	`}`
`343`	`340`
Original file line number	Diff line number	Diff line change
`@@ -29,23 +29,31 @@ public override void ReportSuppressions(SuppressionAnalysisContext context)`
`29`	`29`
`30`	`30`	`if (syntaxTree`
`31`	`31`	`?.GetRoot(token)`
`32`		`- .FindNode(diagnostic.Location.SourceSpan) is`
`33`		`- not AttributeTargetSpecifierSyntax`
	`32`	`+ .FindNode(diagnostic.Location.SourceSpan) is not AttributeTargetSpecifierSyntax`
`34`	`33`	`{`
`35`	`34`	`Identifier.ValueText: "element",`
`36`		`- Parent.Parent: PropertyDeclarationSyntax propertyDeclarationSyntax`
	`35`	`+ Parent.Parent: SyntaxNode declarationSyntax`
`37`	`36`	`})`
`38`	`37`	`{`
`39`	`38`	`continue;`
`40`	`39`	`}`
`41`	`40`
`42`		`- if (context.GetSemanticModel(syntaxTree)`
`43`		`- .GetDeclaredSymbol(propertyDeclarationSyntax, token) is`
`44`		`- not IPropertySymbol`
`45`		`- {`
`46`		`- ContainingType: INamedTypeSymbol containerSymbol,`
`47`		`- Type: ITypeSymbol propertyTypeSymbol`
`48`		`- })`
	`41`	`+ if (context.GetSemanticModel(syntaxTree).GetDeclaredSymbol(declarationSyntax, token) switch`
	`42`	`+ {`
	`43`	`+ IPropertySymbol`
	`44`	`+ {`
	`45`	`+ ContainingType: INamedTypeSymbol ct1,`
	`46`	`+ Type: ITypeSymbol pt1`
	`47`	`+ } => (true, ct1, pt1),`
	`48`	`+`
	`49`	`+ IParameterSymbol`
	`50`	`+ {`
	`51`	`+ ContainingType: INamedTypeSymbol ct1,`
	`52`	`+ Type: ITypeSymbol pt1`
	`53`	`+ } => (true, ct1, pt1),`
	`54`	`+`
	`55`	`+ _ => (false, null, null),`
	`56`	`+ } is not (true, { } containerSymbol, { } propertyTypeSymbol))`
`49`	`57`	`{`
`50`	`58`	`continue;`
`51`	`59`	`}`
`@@ -79,6 +87,8 @@ not IPropertySymbol`
`79`	`87`	`diagnostic`
`80`	`88`	`)`
`81`	`89`	`);`
	`90`	`+`
	`91`	`+ break;`
`82`	`92`	`}`
`83`	`93`	`}`
`84`	`94`	`}`