CommunityToolkit
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 2 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 2 deletions
diff --git a/‎CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
Lines changed: 14 additions & 6 deletions b/‎CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
Lines changed: 14 additions & 6 deletions
@@ -38,7 +38,10 @@ What kind of change does this PR introduce?
 Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR -->
 
 - [ ] Tested code with current [supported SDKs](../#supported)
-- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
+- [ ] New component
+  - [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
+  - [ ] Added description of major feature to project description for NuGet package (4000 total character limit, so don't push entire description over that)
+  - [ ] If control, added to Visual Studio Design project
 - [ ] Sample in sample app has been added / updated (for bug fixes / features)
   - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
 - [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
@@ -51,4 +54,4 @@ Please note that breaking changes are likely to be rejected within minor release
 
 ## Other information
 
-<!-- Please add any other information that might be helpful to reviewers. -->
+<!-- Please add any other information that might be helpful to reviewers. -->
@@ -240,6 +240,14 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                 }
             }
 
+            // In case the backing field is exactly named "value", we need to add the "this." prefix to ensure that comparisons and assignments
+            // with it in the generated setter body are executed correctly and without conflicts with the implicit value parameter.
+            ExpressionSyntax fieldExpression = fieldSymbol.Name switch
+            {
+                "value" => MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, ThisExpression(), IdentifierName("value")),
+                string name => IdentifierName(name)
+            };
+
             BlockSyntax setterBlock;
 
             if (validationAttributes.Count > 0)
@@ -263,10 +271,10 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
 
                     // Generate the inner setter block as follows:
                     //
-                    // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(<FIELD_NAME>, value))
+                    // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(this.<FIELD_NAME>, value))
                     // {
                     //     OnPropertyChanging(global::CommunityToolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangingEventArgs); // Optional
-                    //     <FIELD_NAME> = value;
+                    //     this.<FIELD_NAME> = value;
                     //     OnPropertyChanged(global::CommunityToolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangedEventArgs);
                     //     ValidateProperty(value, <PROPERTY_NAME>);
                     //     OnPropertyChanged(global::CommunityToolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property1PropertyChangedEventArgs); // Optional
@@ -291,7 +299,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                             IdentifierName("Default")),
                                         IdentifierName("Equals")))
                                 .AddArgumentListArguments(
-                                    Argument(IdentifierName(fieldSymbol.Name)),
+                                    Argument(fieldExpression),
                                     Argument(IdentifierName("value")))),
                             Block(
                                 ExpressionStatement(
@@ -303,7 +311,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                 ExpressionStatement(
                                     AssignmentExpression(
                                         SyntaxKind.SimpleAssignmentExpression,
-                                        IdentifierName(fieldSymbol.Name),
+                                        fieldExpression,
                                         IdentifierName("value"))),
                                 ExpressionStatement(
                                     InvocationExpression(IdentifierName("OnPropertyChanged"))
@@ -346,7 +354,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                     ExpressionStatement(
                         AssignmentExpression(
                             SyntaxKind.SimpleAssignmentExpression,
-                            IdentifierName(fieldSymbol.Name),
+                            fieldExpression,
                             IdentifierName("value"))),
                     ExpressionStatement(
                         InvocationExpression(IdentifierName("OnPropertyChanged"))
@@ -384,7 +392,7 @@ private static PropertyDeclarationSyntax CreatePropertyDeclaration(
                                         IdentifierName("Default")),
                                     IdentifierName("Equals")))
                             .AddArgumentListArguments(
-                                    Argument(IdentifierName(fieldSymbol.Name)),
+                                    Argument(fieldExpression),
                                     Argument(IdentifierName("value")))),
                         updateAndNotificationBlock));
             }