Skip to content

Fix optimized DP setter codegen for 'string' properties #794

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

Open
Sergio0694 wants to merge 1 commit into
base: main
Choose a base branch
from
+300 −59
Open

Fix optimized DP setter codegen for 'string' properties #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 56 additions & 9 deletions ...olkit.DependencyPropertyGenerator.SourceGenerators/DependencyPropertyGenerator.Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,29 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)
field = value;
""", isMultiline: true);

// If an optimized 'XamlBindingHelper' method is available, use it directly
if (propertyInfo.XamlBindingHelperSetMethodName is string setMethodName)
// If the property is of type 'string', we need a special path. That is because 'XamlBindingHelper.SetPropertyFromString'
// doesn't work correctly for 'null' or empty strings, so we need to fall back to 'SetValue' in those cases.
if (propertyInfo.TypeName == "string")
{
writer.Write($$"""

if (value is null || value.Length == 0)
Comment thread
Sergio0694 marked this conversation as resolved.
{
SetValue({{propertyInfo.PropertyName}}Property, value);
}
else
{
global::{{WellKnownTypeNames.XamlBindingHelper(propertyInfo.UseWindowsUIXaml)}}.SetPropertyFromString(this, {{propertyInfo.PropertyName}}Property, value);
}

On{{propertyInfo.PropertyName}}Changed(value);
On{{propertyInfo.PropertyName}}Changed(__oldValue, value);
}
""", isMultiline: true);
}
else if (propertyInfo.XamlBindingHelperSetMethodName is string setMethodName)
{
// If an optimized 'XamlBindingHelper' method is available, use it directly
writer.Write($$"""

global::{{WellKnownTypeNames.XamlBindingHelper(propertyInfo.UseWindowsUIXaml)}}.{{setMethodName}}(this, {{propertyInfo.PropertyName}}Property, value);
Expand Down Expand Up @@ -846,15 +866,42 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)

return __unboxedValue;
}
{{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
{
On{{propertyInfo.PropertyName}}Set(ref value);
""", isMultiline: true);

global::{{WellKnownTypeNames.XamlBindingHelper(propertyInfo.UseWindowsUIXaml)}}.{{setMethodName}}(this, {{propertyInfo.PropertyName}}Property, value);
// For 'string' properties, we need a specialized path (see comment in the local caching branch above)
if (propertyInfo.TypeName == "string")
{
writer.WriteLine($$"""
{{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
{
On{{propertyInfo.PropertyName}}Set(ref value);

On{{propertyInfo.PropertyName}}Changed(value);
}
""", isMultiline: true);
if (value is null || value.Length == 0)
{
SetValue({{propertyInfo.PropertyName}}Property, value);
}
else
{
global::{{WellKnownTypeNames.XamlBindingHelper(propertyInfo.UseWindowsUIXaml)}}.SetPropertyFromString(this, {{propertyInfo.PropertyName}}Property, value);
}

On{{propertyInfo.PropertyName}}Changed(value);
}
""", isMultiline: true);
}
else
{
writer.WriteLine($$"""
{{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
{
On{{propertyInfo.PropertyName}}Set(ref value);

global::{{WellKnownTypeNames.XamlBindingHelper(propertyInfo.UseWindowsUIXaml)}}.{{setMethodName}}(this, {{propertyInfo.PropertyName}}Property, value);

On{{propertyInfo.PropertyName}}Changed(value);
}
""", isMultiline: true);
}
}
else
{
Expand Down
Loading
Loading