Respect accessibility of generated accessors

CommunityToolkit · Dec 27, 2024 · f456963 · f456963
1 parent 1dadd4d
commit f456963
Show file tree

Hide file tree

Showing 2 changed files with 147 additions and 31 deletions.
diff --git a/...olkit.DependencyPropertyGenerator.SourceGenerators/DependencyPropertyGenerator.Execute.cs b/...olkit.DependencyPropertyGenerator.SourceGenerators/DependencyPropertyGenerator.Execute.cs
@@ -554,8 +554,8 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)
                     if (propertyInfo.IsLocalCachingEnabled)
                     {
                         writer.WriteLine($$"""
-                            get => field;
-                            set
+                            {{GetExpressionWithTrailingSpace(propertyInfo.GetterAccessibility)}}get => field;
+                            {{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
                             {
                                 On{{propertyInfo.PropertyName}}Set(ref value);
 
@@ -602,15 +602,15 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)
                         // would introduce a lot of overhead. If callers really do want to have a callback being invoked, they can implement
                         // the one wired up to the property metadata directly. We can still invoke the ones only using the new value, though.
                         writer.WriteLine($$"""
-                            get
+                            {{GetExpressionWithTrailingSpace(propertyInfo.GetterAccessibility)}}get
                             {
                                 object? __boxedValue = GetValue({{propertyInfo.PropertyName}}Property);
 
                                 On{{propertyInfo.PropertyName}}Get(ref __boxedValue);
 
                                 return __boxedValue;
                             }
-                            set
+                            {{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
                             {
                                 On{{propertyInfo.PropertyName}}Set(ref value);
 
@@ -624,7 +624,7 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)
                     {
                         // Same as above but with the extra typed hook for both accessors
                         writer.WriteLine($$"""
-                            get
+                            {{GetExpressionWithTrailingSpace(propertyInfo.GetterAccessibility)}}get
                             {
                                 object? __boxedValue = GetValue({{propertyInfo.PropertyName}}Property);
 
@@ -636,7 +636,7 @@ static string GetExpressionWithTrailingSpace(Accessibility accessibility)
 
                                 return __unboxedValue;
                             }
-                            set
+                            {{GetExpressionWithTrailingSpace(propertyInfo.SetterAccessibility)}}set
                             {
                                 On{{propertyInfo.PropertyName}}Set(ref value);