Skip to content

[RGen] Update string strategy to fail on empty selectors. #23646

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 10 commits into from
Sep 3, 2025
Merged

[RGen] Update string strategy to fail on empty selectors. #23646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ff9854
[Rgen] Add validations for the Export<Property> attribute.
mandel-macaque Aug 14, 2025
af25743
[RGen] Add extra validations for the Export of methods and properties.
mandel-macaque Aug 15, 2025
b7a1c1c
[RGen] Apps the RootContext to the validation strategies.
mandel-macaque Aug 17, 2025
7d22427
[RGen] Move the BindingTypeSemanticAnalyzer to use the Binding struct…
mandel-macaque Aug 17, 2025
fa8473b
[RGen] Implement the SmartEnum anaylyzer using a validator.
mandel-macaque Aug 18, 2025
6b3167d
[RGen] Add a validator for property fields.
mandel-macaque Aug 18, 2025
6fc5621
[RGen] Update string strategy to fail on empty selectors.
mandel-macaque Aug 20, 2025
de4c39b
Auto-format source code
Aug 20, 2025
d924e12
Merge branch 'main' into dev/mandel/string-null-or-empty
mandel-macaque Sep 2, 2025
db1d4ec
Fix typo.
mandel-macaque Sep 2, 2025
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/rgen/Microsoft.Macios.Bindings.Analyzer/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rgen/Microsoft.Macios.Bindings.Analyzer/Validators/ExportMethodAttributeValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ internal static bool FlagsAreValid (ExportMethod exportData, RootContext context
/// <returns><c>true</c> if the data is valid; otherwise, <c>false</c>.</returns>
internal static bool SelectorIsNotNull (string? selector, RootContext context, out ImmutableArray<Diagnostic> diagnostics,
Location? location = null)
=> StringStrategies.IsNotNull (
=> StringStrategies.IsNotNullOrEmpty (
selector: selector,
descriptor: RBI0022, // A export property must have a selector defined
diagnostics: out diagnostics,
Expand Down
2 changes: 1 addition & 1 deletion src/rgen/Microsoft.Macios.Bindings.Analyzer/Validators/ExportPropertyAttributeValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ExportPropertyAttributeValidator : Validator<ExportData<Property>> {
/// <returns><c>true</c> if the data is valid; otherwise, <c>false</c>.</returns>
internal static bool SelectorIsNotNull (string? selector, RootContext context, out ImmutableArray<Diagnostic> diagnostics,
Location? location = null)
=> StringStrategies.IsNotNull (
=> StringStrategies.IsNotNullOrEmpty (
selector: selector,
descriptor: RBI0018, // A export property must have a selector defined
diagnostics: out diagnostics,
Expand Down
2 changes: 1 addition & 1 deletion src/rgen/Microsoft.Macios.Bindings.Analyzer/Validators/FieldValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class FieldValidator : Validator<Property> {
/// <returns><c>true</c> if the selector is not null or empty; otherwise, <c>false</c>.</returns>
internal static bool SelectorIsNotNull (string? selector, RootContext context, out ImmutableArray<Diagnostic> diagnostics,
Location? location = null)
=> StringStrategies.IsNotNull (
=> StringStrategies.IsNotNullOrEmpty (
selector: selector,
descriptor: RBI0018, // A export property must have a selector defined
diagnostics: out diagnostics,
Expand Down
4 changes: 2 additions & 2 deletions src/rgen/Microsoft.Macios.Bindings.Analyzer/Validators/StringStrategies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ public static class StringStrategies {
/// <param name="diagnostics">When this method returns, contains an array of diagnostics if the data is invalid; otherwise, an empty array.</param>
/// <param name="location">The code location to be used for the diagnostics.</param>
/// <returns><c>true</c> if the data is valid; otherwise, <c>false</c>.</returns>
internal static bool IsNotNull (string? selector, DiagnosticDescriptor descriptor, out ImmutableArray<Diagnostic> diagnostics,
internal static bool IsNotNullOrEmpty (string? selector, DiagnosticDescriptor descriptor, out ImmutableArray<Diagnostic> diagnostics,
Location? location = null)
{
diagnostics = ImmutableArray<Diagnostic>.Empty;
if (selector is not null)
if (!string.IsNullOrEmpty (selector))
return true;
diagnostics = [
Diagnostic.Create (
Expand Down
2 changes: 1 addition & 1 deletion tests/rgen/Microsoft.Macios.Bindings.Analyzer.Tests/Validators/FieldValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void ValidateValidFieldPropertyTests ()

[Theory]
[InlineData ("validSelector", true, 0)]
[InlineData ("", true, 0)]
[InlineData ("", false, 1)]
[InlineData (null, false, 1)]
[InlineData ("another_valid_selector", true, 0)]
[InlineData ("valid123", true, 0)]
Expand Down