Skip to content

fix cast rewritten when extracting pattern decl. of type that is a type parameter #40

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 3 commits into from
Jul 20, 2022
Merged

fix cast rewritten when extracting pattern decl. of type that is a type parameter #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a733559
fix pattern type cast through type parameter
ltcmelo Jul 20, 2022
f5c278c
Merge branch 'master' into p31
ltcmelo Jul 20, 2022
ec14087
bump version
ltcmelo Jul 20, 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
28 changes: 23 additions & 5 deletions src/SharpSyntaxRewriter/Rewriters/ExtractDeclarationFromPattern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,22 @@ private void __MaybeTurnDesignationIntoDeclaration(
Debug.Assert(__exprs.Any());
var expr = __exprs.Peek();

var varTy = __patterns.Any()
? SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.ObjectKeyword))
: varDesigTy;
TypeSyntax varTy;
ExpressionSyntax varExpr;
if (__patterns.Any())
{
varTy = SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.ObjectKeyword));
varExpr = expr;
}
else
{
varTy = varDesigTy;
varExpr =
SyntaxFactory.CastExpression(
SyntaxFactory.PredefinedType(
SyntaxFactory.Token(SyntaxKind.ObjectKeyword)),
expr);
}

var declStmt =
SyntaxFactory.LocalDeclarationStatement(
Expand All @@ -59,7 +72,7 @@ private void __MaybeTurnDesignationIntoDeclaration(
SyntaxFactory.EqualsValueClause(
SyntaxFactory.CastExpression(
varTy,
expr))))));
varExpr))))));

_ctx.Peek().Add(declStmt);
}
Expand Down Expand Up @@ -190,7 +203,12 @@ public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
if (varDesig.Identifier.Text != node.Identifier.Text)
return node;

return SyntaxFactory.CastExpression(pattType, node);
return SyntaxFactory.CastExpression(
pattType,
SyntaxFactory.CastExpression(
SyntaxFactory.PredefinedType(
SyntaxFactory.Token(SyntaxKind.ObjectKeyword)),
node));
}
}
}
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.54</PackageVersion>
<PackageVersion>1.0.55</PackageVersion>
<Authors>Leandro T. C. Melo</Authors>
<Copyright>ShiftLeft Inc.</Copyright>
<NeutralLanguage>en-US</NeutralLanguage>
Expand Down
67 changes: 49 additions & 18 deletions tests/TestExtractDeclarationFromPattern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,45 @@ class CCC
{
private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; var vvv = ppp is DateTime;
DateTime ddd = (DateTime)(object)ppp; var vvv = ppp is DateTime;
}
}
";

TestRewrite_LinePreserve(original, expected);
}

[TestMethod]
public void TestExtractDeclarationFromPatternAsVarInitializerAndTypeParameter()
{
var original = @"
using System;

class CCC
{
private void FFF<TTT>(TTT ppp)
{
var vvv = ppp is DateTime ddd;
}
}
";

var expected = @"
using System;

class CCC
{
private void FFF<TTT>(TTT ppp)
{
DateTime ddd = (DateTime)(object)ppp; var vvv = ppp is DateTime;
}
}
";

TestRewrite_LinePreserve(original, expected);
}


[TestMethod]
public void TestExtractDeclarationFromPatternAsObjectInitializer()
{
Expand Down Expand Up @@ -73,7 +104,7 @@ class CCC

private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; var vvv = new CCC
DateTime ddd = (DateTime)(object)ppp; var vvv = new CCC
{
Data = ppp is DateTime ? ddd : null
};
Expand Down Expand Up @@ -109,7 +140,7 @@ class CCC
private void GGG(DateTime ppp) {}
private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; if (ppp is DateTime)
DateTime ddd = (DateTime)(object)ppp; if (ppp is DateTime)
GGG(ddd);
}
}
Expand Down Expand Up @@ -145,7 +176,7 @@ private void GGG(DateTime ppp) {}
private void FFF(object ppp)
{
if (true)
{ DateTime ddd = (DateTime)ppp; if (ppp is DateTime)
{ DateTime ddd = (DateTime)(object)ppp; if (ppp is DateTime)
GGG(ddd); }
}
}
Expand Down Expand Up @@ -184,7 +215,7 @@ private void FFF(object ppp)
{
if (true)
{
DateTime ddd = (DateTime)ppp; if (ppp is DateTime)
DateTime ddd = (DateTime)(object)ppp; if (ppp is DateTime)
GGG(ddd);
}
}
Expand Down Expand Up @@ -219,7 +250,7 @@ class CCC
private void GGG(DateTime ppp) {}
private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; if (true && ppp is DateTime)
DateTime ddd = (DateTime)(object)ppp; if (true && ppp is DateTime)
GGG(ddd);
}
}
Expand Down Expand Up @@ -254,7 +285,7 @@ class CCC
private int GGG(DateTime ppp) { return 0; }
private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; Data = ppp is DateTime ? GGG(ddd) : 1;
DateTime ddd = (DateTime)(object)ppp; Data = ppp is DateTime ? GGG(ddd) : 1;
}
}
";
Expand Down Expand Up @@ -291,7 +322,7 @@ class CCC
private int GGG(DateTime ppp) { return 0; }
private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; var vvv = new CCC
DateTime ddd = (DateTime)(object)ppp; var vvv = new CCC
{
Data = ppp is DateTime ? GGG(ddd) : 1
};
Expand Down Expand Up @@ -334,7 +365,7 @@ class CCC

private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; string sss = (string)ppp; var vvv = new CCC
DateTime ddd = (DateTime)(object)ppp; string sss = (string)(object)ppp; var vvv = new CCC
{
DDD = ppp is DateTime ? ddd : null,
SSS = ppp is string ? sss : "" ""
Expand Down Expand Up @@ -422,7 +453,7 @@ private void GGG(DateTime? ppp) { }

private void FFF(object ppp)
{
DateTime ddd = (DateTime)ppp; GGG(ppp is DateTime ? ddd : null);
DateTime ddd = (DateTime)(object)ppp; GGG(ppp is DateTime ? ddd : null);
}
}
";
Expand Down Expand Up @@ -577,8 +608,8 @@ private int FFF(object ppp)
{
object ddd = (object)ppp; object sss = (object)ppp; return ppp switch
{
DateTime => DDD((DateTime)ddd),
string => SSS((string)sss),
DateTime => DDD((DateTime)(object)ddd),
string => SSS((string)(object)sss),
_ => 0,
};
}
Expand Down Expand Up @@ -621,8 +652,8 @@ private int FFF(object ppp)
{
object uuu = (object)ppp; return ppp switch
{
DateTime => DDD((DateTime)uuu),
string => SSS((string)uuu),
DateTime => DDD((DateTime)(object)uuu),
string => SSS((string)(object)uuu),
_ => 0,
};
}
Expand Down Expand Up @@ -660,8 +691,8 @@ string FFF(object ppp)
{
object sss = (object)ppp; return ppp switch
{
string { Length: >= 5 } => (string)sss.Substring(0, 5),
string => (string)sss,
string { Length: >= 5 } => (string)(object)sss.Substring(0, 5),
string => (string)(object)sss,
};
}
}
Expand Down Expand Up @@ -698,8 +729,8 @@ string FFF(object ppp)
{
object sss = (object)ppp; object qqq = (object)ppp; return ppp switch
{
string { Length: >= 5 } => (string)sss.Substring(0, 5),
string => (string)qqq,
string { Length: >= 5 } => (string)(object)sss.Substring(0, 5),
string => (string)(object)qqq,
};
}
}
Expand Down