Skip to content

Improved nullable support #30

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
simonrozsival merged 12 commits into from
May 14, 2024
Merged

Improved nullable support #30

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a4d737c
added unit tests for nullable disabled
jkurdek May 8, 2024
88dfdcf
added integration tests for nullable disabled
jkurdek May 8, 2024
c5bc172
add nullable disabled support for reference types
jkurdek May 10, 2024
0d06066
wip: added support for nullable disabled on value types
jkurdek May 10, 2024
1116173
improved integration tests
jkurdek May 10, 2024
cd1f6fc
initialize support for indexers
jkurdek May 10, 2024
e85fede
add indexers support to SetterBuilder
jkurdek May 11, 2024
8c856ec
added additional tests for setter builder
jkurdek May 11, 2024
86521ee
cleaned up SetterBuilder
jkurdek May 11, 2024
5cfce1f
Fixed nullable access with BindingTransformer
jkurdek May 14, 2024
02b537a
Removed IsNullableValueType property
jkurdek May 14, 2024
2c80122
Cleaned up nullability
jkurdek May 14, 2024
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
107 changes: 93 additions & 14 deletions src/Controls/tests/BindingSourceGen.UnitTests/BindingRepresentationGenTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class Foo
}

[Fact]
public void GenerateBindingWithNullableReferenceTypesWhenNullableDisabled()
public void GenerateBindingWithNullableReferenceTypesWhenNullableDisabledAndConditionalAccessOperator()
{
var source = """
using Microsoft.Maui.Controls;
Expand Down Expand Up @@ -212,27 +212,106 @@ class Foo
}

[Fact]
public void GenerateBindingWithNullableValueTypeWhenNullableDisabled()
public void GenerateBindingWhenNullableDisabledAndPropertyNonNullableValueType()
{
var source = """
using Microsoft.Maui.Controls;
#nullable disable
var label = new Label();
label.SetBinding(Label.RotationProperty, static (Foo f) => f.Value);
label.SetBinding(Label.RotationProperty, static (Foo f) => f.Bar.Length);

class Foo
{
public int? Value { get; set; }
public Bar Bar { get; set; }
}

class Bar
{
public int Length { get; set; }
}
""";

var codeGeneratorResult = SourceGenHelpers.Run(source);
var expectedBinding = new SetBindingInvocationDescription(
new InterceptorLocation(@"Path\To\Program.cs", 4, 7),
new TypeDescription("global::Foo", IsNullable: true),
new TypeDescription("int", IsValueType: true, IsNullable: true),
new TypeDescription("int", IsValueType: true),
new EquatableArray<IPathPart>([
new MemberAccess("Value"),
new ConditionalAccess(new MemberAccess("Bar")),
new ConditionalAccess(new MemberAccess("Length")),
]),
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}

[Fact]
public void GenerateBindingWhenNullableDisabledAndPropertyNullableValueType()
{
var source = """
using Microsoft.Maui.Controls;
#nullable disable
var label = new Label();
label.SetBinding(Label.RotationProperty, static (Foo f) => f.Bar.Length);

class Foo
{
public Bar Bar { get; set; }
}

class Bar
{
public int? Length { get; set; }
}
""";

var codeGeneratorResult = SourceGenHelpers.Run(source);
var expectedBinding = new SetBindingInvocationDescription(
new InterceptorLocation(@"Path\To\Program.cs", 4, 7),
new TypeDescription("global::Foo", IsNullable: true),
new TypeDescription("int", IsNullable: true, IsValueType: true),
new EquatableArray<IPathPart>([
new ConditionalAccess(new MemberAccess("Bar")),
new ConditionalAccess(new MemberAccess("Length")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}

[Fact]
public void GenerateBindingWhenNullableDisabledAndPropertyReferenceType()
{
var source = """
using Microsoft.Maui.Controls;
#nullable disable
var label = new Label();
label.SetBinding(Label.RotationProperty, static (Foo f) => f.Bar.Length);

class Foo
{
public Bar Bar { get; set; }
}

class Bar
{
public CustomLength Length { get; set; }
}

class CustomLength
{

}
""";

var codeGeneratorResult = SourceGenHelpers.Run(source);
var expectedBinding = new SetBindingInvocationDescription(
new InterceptorLocation(@"Path\To\Program.cs", 4, 7),
new TypeDescription("global::Foo", IsNullable: true),
new TypeDescription("global::CustomLength", IsNullable: true),
new EquatableArray<IPathPart>([
new ConditionalAccess(new MemberAccess("Bar")),
new ConditionalAccess(new MemberAccess("Length")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: true));

Expand Down Expand Up @@ -520,7 +599,7 @@ class Foo
new MemberAccess("Value"),
new Cast(new TypeDescription("string")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down Expand Up @@ -548,7 +627,7 @@ class Foo
new MemberAccess("Value"),
new Cast(new TypeDescription("string")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down Expand Up @@ -582,7 +661,7 @@ class C
new Cast(new TypeDescription("global::C")),
new ConditionalAccess(new MemberAccess("X")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down Expand Up @@ -616,7 +695,7 @@ class C
new Cast(new TypeDescription("global::C")),
new MemberAccess("X"),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down Expand Up @@ -653,7 +732,7 @@ class C
new Cast(new TypeDescription("global::C")),
new ConditionalAccess(new MemberAccess("X")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down Expand Up @@ -683,7 +762,7 @@ class Foo
new MemberAccess("Value"),
new Cast(new TypeDescription("int", IsNullable: true, IsValueType: true)),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));


AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
Expand Down Expand Up @@ -712,7 +791,7 @@ class Foo
new MemberAccess("Value"),
new Cast(new TypeDescription("int", IsValueType: true)),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));


AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
Expand Down Expand Up @@ -749,7 +828,7 @@ struct C
new Cast(new TypeDescription("global::C", IsNullable: true, IsValueType: true)),
new ConditionalAccess(new MemberAccess("X")),
]),
SetterOptions: new(IsWritable: true, AcceptsNullValue: false));
SetterOptions: new(IsWritable: true));

AssertExtensions.BindingsAreEqual(expectedBinding, codeGeneratorResult);
}
Expand Down
Loading