Skip to content

Commit 0aed7ad

Browse files
committed
Refactor InitializingPropertyName property
1 parent c80418c commit 0aed7ad

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/CommunityToolkit.Maui.SourceGenerators.Internal.UnitTests/BindablePropertyModelTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public void BindablePropertyModel_WithAllParameters_StoresCorrectValues()
9292
Assert.Equal(hasInitializer, model.HasInitializer);
9393
Assert.Equal("TestPropertyProperty", model.BindablePropertyName);
9494
Assert.Equal(defaultValueCreatorMethodName, model.EffectiveDefaultValueCreatorMethodName);
95+
Assert.Equal("__initializingTestProperty", model.InitializingPropertyName);
9596
}
9697

9798
[Fact]

src/CommunityToolkit.Maui.SourceGenerators.Internal/Generators/BindablePropertyAttributeSourceGenerator.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ static void GenerateProperty(StringBuilder sb, in BindablePropertyModel info)
320320

321321
if (info.HasInitializer)
322322
{
323-
sb.Append("__initializing")
324-
.Append(info.PropertyName)
323+
sb.Append(info.InitializingPropertyName)
325324
.Append(" ? field : ");
326325
}
327326

@@ -555,8 +554,7 @@ static string GetFormattedReturnType(ITypeSymbol typeSymbol)
555554
static void GenerateInitializingProperty(StringBuilder sb, in BindablePropertyModel info)
556555
{
557556
sb.Append("bool ")
558-
.Append("__initializing")
559-
.Append(info.PropertyName)
557+
.Append(info.InitializingPropertyName)
560558
.Append(" = false;\n");
561559
}
562560

@@ -579,8 +577,8 @@ static void GenerateDefaultValueMethod(StringBuilder sb, in BindablePropertyMode
579577
.Append("{\n")
580578
.Append("((")
581579
.Append(classNameWithGenerics)
582-
.Append(")bindable).__initializing")
583-
.Append(info.PropertyName)
580+
.Append(")bindable).")
581+
.Append(info.InitializingPropertyName)
584582
.Append(" = true;\n")
585583
.Append("var defaultValue = ")
586584
.Append("((")
@@ -590,8 +588,8 @@ static void GenerateDefaultValueMethod(StringBuilder sb, in BindablePropertyMode
590588
.Append(";\n")
591589
.Append("((")
592590
.Append(classNameWithGenerics)
593-
.Append(")bindable).__initializing")
594-
.Append(info.PropertyName)
591+
.Append(")bindable).")
592+
.Append(info.InitializingPropertyName)
595593
.Append(" = false;\n")
596594
.Append("return defaultValue;\n")
597595
.Append("}\n");

src/CommunityToolkit.Maui.SourceGenerators.Internal/Models/Records.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ record BindablePropertyModel(string PropertyName, ITypeSymbol ReturnType, ITypeS
88
public string BindablePropertyName => $"{PropertyName}Property";
99
public string BindablePropertyKeyName => $"{char.ToLower(PropertyName[0])}{PropertyName[1..]}PropertyKey";
1010
public string EffectiveDefaultValueCreatorMethodName => HasInitializer ? $"__createDefault{PropertyName}" : DefaultValueCreatorMethodName;
11+
public string InitializingPropertyName => $"__initializing{PropertyName}";
1112
}
1213

1314
record SemanticValues(ClassInformation ClassInformation, EquatableArray<BindablePropertyModel> BindableProperties);

0 commit comments

Comments
 (0)