Skip to content

fix implementation of (readonly) auto property that is accessed through ++ (and similar) #28

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

Merged
ltcmelo merged 5 commits into from
Jun 23, 2022
Merged

fix implementation of (readonly) auto property that is accessed through ++ (and similar) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63da0f4
use an explicit 'within ctor' field instead of querying up the AST
ltcmelo Jun 22, 2022
b74aee1
visit prefix/postfix unary expression
ltcmelo Jun 22, 2022
1e38d62
reuse new code in assignment expr
ltcmelo Jun 22, 2022
e84c2c4
equivalent test for pre increment
ltcmelo Jun 22, 2022
92e5fd9
bump version
ltcmelo Jun 23, 2022
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
66 changes: 54 additions & 12 deletions src/SharpSyntaxRewriter/Rewriters/ImplementAutoProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,26 +281,68 @@ public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax no
/*
* See https://github.com/dotnet/csharplang/issues/2468 for the reason of this visit.
*/
private bool __withinCtor;
public override SyntaxNode VisitConstructorDeclaration(ConstructorDeclarationSyntax node)
{
__withinCtor = true;
var node_P = base.VisitConstructorDeclaration(node);
__withinCtor = false;

return node_P;
}

public override SyntaxNode VisitAssignmentExpression(AssignmentExpressionSyntax node)
{
if (!node.Ancestors().OfType<ConstructorDeclarationSyntax>().Any())
if (!__withinCtor)
return node;

var node_P = node.WithRight((ExpressionSyntax)node.Right.Accept(this));

var lhsSym = _semaModel.GetSymbolInfo(node.Left).Symbol;
if (lhsSym is IPropertySymbol propSym
&& propSym.IsReadOnly
&& propSym.DeclaringSyntaxReferences.Any())
{
return
node_P.WithLeft(
SyntaxFactory.IdentifierName(
SynthesizedFieldName(propSym.Name))
.WithTriviaFrom(node.Left));
}
var chosenExpr = __ChooseBetweenPropertyOrFieldExpression(node.Left, lhsSym);
return chosenExpr == node.Left
? node_P
: node_P.WithLeft(chosenExpr);
}

return node_P;
public override SyntaxNode VisitPrefixUnaryExpression(PrefixUnaryExpressionSyntax node)
{
if (!__withinCtor)
return node;

var node_P = node.WithOperand((ExpressionSyntax)node.Operand.Accept(this));

var operandSym = _semaModel.GetSymbolInfo(node.Operand).Symbol;
var chosenExpr = __ChooseBetweenPropertyOrFieldExpression(node.Operand, operandSym);
return chosenExpr == node.Operand
? node_P
: node_P.WithOperand(chosenExpr);
}

public override SyntaxNode VisitPostfixUnaryExpression(PostfixUnaryExpressionSyntax node)
{
if (!__withinCtor)
return node;

var node_P = node.WithOperand((ExpressionSyntax)node.Operand.Accept(this));

var operandSym = _semaModel.GetSymbolInfo(node.Operand).Symbol;
var choseExpr = __ChooseBetweenPropertyOrFieldExpression(node.Operand, operandSym);
return choseExpr == node.Operand
? node_P
: node_P.WithOperand(choseExpr);
}

private ExpressionSyntax __ChooseBetweenPropertyOrFieldExpression(
ExpressionSyntax propExpr,
ISymbol sym)
{
return (sym is IPropertySymbol propSym
&& propSym.IsReadOnly
&& propSym.DeclaringSyntaxReferences.Any())
? SyntaxFactory.IdentifierName(SynthesizedFieldName(propSym.Name))
.WithTriviaFrom(propExpr)
: propExpr;
}

public static string SynthesizedFieldName(string propName)
Expand Down
2 changes: 1 addition & 1 deletion src/SharpSyntaxRewriter/SharpSyntaxRewriter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>SharpSyntaxRewriter</PackageId>
<PackageVersion>1.0.44</PackageVersion>
<PackageVersion>1.0.45</PackageVersion>
<Authors>Leandro T. C. Melo</Authors>
<Copyright>ShiftLeft Inc.</Copyright>
<NeutralLanguage>en-US</NeutralLanguage>
Expand Down
60 changes: 60 additions & 0 deletions tests/TestImplementAutoProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,66 @@ public A()
aaa[0] = 0;
}
}
";

TestRewrite_LinePreserve(original, expected);
}

[TestMethod]
public void TestImplementAutoPropertyWithOnlyGetAccessorButWriteAccessInPostIncrement()
{
var original = @"
public class PagedList
{
public int TotalPages { get; }

public PagedList()
{
TotalPages++;
}
}
";

var expected = @"
public class PagedList
{
public int TotalPages { get { return ____LT____TotalPages____GT____k_BackingField; } } public int ____LT____TotalPages____GT____k_BackingField;

public PagedList()
{
____LT____TotalPages____GT____k_BackingField++;
}
}
";

TestRewrite_LinePreserve(original, expected);
}

[TestMethod]
public void TestImplementAutoPropertyWithOnlyGetAccessorButWriteAccessInPreIncrement()
{
var original = @"
public class PagedList
{
public int TotalPages { get; }

public PagedList()
{
++TotalPages;
}
}
";

var expected = @"
public class PagedList
{
public int TotalPages { get { return ____LT____TotalPages____GT____k_BackingField; } } public int ____LT____TotalPages____GT____k_BackingField;

public PagedList()
{
++____LT____TotalPages____GT____k_BackingField;
}
}
";

TestRewrite_LinePreserve(original, expected);
Expand Down