Skip to content
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

fix(source-generators): namof issues #145

Merged
merged 1 commit into from
Mar 16, 2025
Merged

fix(source-generators): namof issues #145

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
2 changes: 1 addition & 1 deletion src/Atc.Wpf.SourceGenerators/Extensions/Builder/FrameworkElementBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private static void GenerateDependencyPropertyHeader(
builder.AppendLine($"public static readonly DependencyProperty {p.Name}Property = DependencyProperty.{registerMethod}(");
builder.IncreaseIndent();

builder.AppendLine(isAttached ? $"\"{p.Name}\"," : $"nameof({p.Name}),");
builder.AppendLine(isAttached ? $"\"{p.Name}\"," : $"{p.Name.EnsureNameofContent()},");
builder.AppendLine($"typeof({p.Type}),");
}

Expand Down
29 changes: 25 additions & 4 deletions src/Atc.Wpf.SourceGenerators/Extensions/Builder/ViewModelBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,23 @@ private static void GenerateProperty(
builder.AppendLine($"var oldValue = {p.BackingFieldName};");
}

var nameofName = p.Name.EnsureNameofContent();

builder.AppendLine($"{p.BackingFieldName} = value;");
builder.AppendLine($"RaisePropertyChanged(nameof({p.Name}));");
builder.AppendLine($"RaisePropertyChanged({nameofName});");
if (p.PropertyNamesToInvalidate is not null)
{
foreach (var propertyNameToInvalidate in p.PropertyNamesToInvalidate)
{
builder.AppendLine($"RaisePropertyChanged(nameof({propertyNameToInvalidate}));");
var nameofPropertyNameToInvalidate = propertyNameToInvalidate.EnsureNameofContent();

builder.AppendLine($"RaisePropertyChanged({nameofPropertyNameToInvalidate});");
}
}

if (p.BroadcastOnChange)
{
builder.AppendLine($"Broadcast(nameof({p.Name}), oldValue, value);");
builder.AppendLine($"Broadcast({nameofName}, oldValue, value);");
}

if (p.AfterChangedCallback is not null)
Expand All @@ -101,7 +105,24 @@ private static void GenerateCallbackInlineCode(
if (value.StartsWith("nameof(", StringComparison.Ordinal) &&
value.EndsWith(")", StringComparison.Ordinal))
{
builder.AppendLine(value.ExtractInnerContent() + "();");
var valueContent = value.ExtractInnerContent();
var sa = valueContent.Split([';'], StringSplitOptions.RemoveEmptyEntries);
foreach (var s in sa)
{
var line = s.Trim();
if (line.EndsWith("();", StringComparison.Ordinal))
{
builder.AppendLine(line);
}
else if (line.EndsWith("()", StringComparison.Ordinal))
{
builder.AppendLine(line + ";");
}
else
{
builder.AppendLine(line + "();");
}
}
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/Atc.Wpf.SourceGenerators/Extensions/CodeAnalysis/AttributeDataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ public static string ExtractClassFirstArgumentType(
arrayIndex++;
result.Add(
arrayIndex.ToString(CultureInfo.InvariantCulture),
typedConstant.Value.ToString());
$"nameof({typedConstant.Value})");
}
}
else
{
result.Add(
arg.Key,
arg.Value.Value?.ToString());
$"nameof({arg.Value.Value})");
}
}

Expand Down
22 changes: 21 additions & 1 deletion src/Atc.Wpf.SourceGenerators/Extensions/ObjectExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace Atc.Wpf.SourceGenerators.Extensions;

internal static class ObjectExtensions
{
[SuppressMessage("Design", "MA0051:Method is too long", Justification = "OK.")]
public static string? TransformDefaultValueIfNeeded(
this object? defaultValue,
string type)
Expand All @@ -11,7 +12,11 @@ internal static class ObjectExtensions
return null;
}

var strDefaultValue = defaultValue.ToString();
var strDefaultValue = defaultValue
.ToString()?
.EnsureNoNameof()?
.ToString() ?? string.Empty;

if (!type.IsSimpleType())
{
return strDefaultValue;
Expand Down Expand Up @@ -64,4 +69,19 @@ internal static class ObjectExtensions

return strDefaultValue;
}

public static object? EnsureNoNameof(
this object? value)
{
if (value is null ||
!value.ToString().StartsWith("nameof", StringComparison.Ordinal))
{
return value;
}

return value
.ToString()
.Replace("nameof(", string.Empty)
.Replace(")", string.Empty);
}
}
24 changes: 24 additions & 0 deletions src/Atc.Wpf.SourceGenerators/Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@ public static class StringExtensions
{ nameof(String), "string" },
};

public static string EnsureNameofContent(
this string value)
{
if (value is null)
{
throw new ArgumentNullException(nameof(value));
}

if (!value.StartsWith("nameof(", StringComparison.Ordinal) ||
!value.EndsWith(")", StringComparison.Ordinal))
{
return $"nameof({value})";
}

if (value.StartsWith("nameof(nameof(", StringComparison.Ordinal))
{
value = value
.Replace("nameof(nameof(", "nameof(")
.Replace("))", ")");
}

return value;
}

public static string EnsureFirstCharacterToUpper(
this string value)
{
Expand Down
Loading