Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

VB.Net to C# conversion bugs #42

Merged
siegfriedpammer merged 3 commits into from
Jul 6, 2013
Merged

VB.Net to C# conversion bugs #42

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
89dc154
properly handle VB.Net to CS LINQ where and select output
sharpmonkey Jun 24, 2013
8a9b312
handle VB.Net Axis LINQ syntax to CS conversion with tests
sharpmonkey Jun 24, 2013
8273535
handle VB.Net to CS conversion set attribute Axis syntax; replace ass…
sharpmonkey Jun 24, 2013
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
73 changes: 69 additions & 4 deletions src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2400,7 +2400,54 @@ public override object TrackedVisitInvocationExpression(InvocationExpression inv
outputFormatter.PrintToken(Tokens.CloseParenthesis);
return null;
}


public override object TrackedVisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data)
{
var parentAsAssignment = xmlMemberAccessExpression.Parent as AssignmentExpression;
var xmlMemberAccessExpressionOnLeftOfAssignment = parentAsAssignment != null && parentAsAssignment.Left == xmlMemberAccessExpression;

// only output identifier expression if we are not overriding assignment with method call
if(!(xmlMemberAccessExpression.AxisType == XmlAxisType.Attribute && xmlMemberAccessExpressionOnLeftOfAssignment))
xmlMemberAccessExpression.TargetObject.AcceptVisitor(this, data);

switch (xmlMemberAccessExpression.AxisType)
{
case XmlAxisType.Element:
outputFormatter.PrintToken(Tokens.Dot);
outputFormatter.PrintText("Elements(\"");
outputFormatter.PrintText(xmlMemberAccessExpression.Identifier);
outputFormatter.PrintText("\")");
break;
case XmlAxisType.Attribute:
if (!xmlMemberAccessExpressionOnLeftOfAssignment)
{
outputFormatter.PrintToken(Tokens.Dot);
outputFormatter.PrintText("Attribute(\"");
outputFormatter.PrintText(xmlMemberAccessExpression.Identifier);
outputFormatter.PrintText("\").Value");
}
else
{
// we need to convert assignment to method call
return AstBuilder.ExpressionBuilder.Call(
xmlMemberAccessExpression.TargetObject,
"SetAttributeValue",
new PrimitiveExpression(xmlMemberAccessExpression.Identifier),
parentAsAssignment.Right);
}
break;
case XmlAxisType.Descendents:
outputFormatter.PrintToken(Tokens.Dot);
outputFormatter.PrintText("Descendants(\"");
outputFormatter.PrintText(xmlMemberAccessExpression.Identifier);
outputFormatter.PrintText("\")");
break;
default:
throw new Exception("Invalid value for XmlAxisType");
}
return null;
}

public override object TrackedVisitIdentifierExpression(IdentifierExpression identifierExpression, object data)
{
outputFormatter.PrintIdentifier(identifierExpression.Identifier);
Expand Down Expand Up @@ -2472,7 +2519,12 @@ public override object TrackedVisitUnaryOperatorExpression(UnaryOperatorExpressi

public override object TrackedVisitAssignmentExpression(AssignmentExpression assignmentExpression, object data)
{
TrackVisit(assignmentExpression.Left, data);
var overrideExpression = TrackVisit(assignmentExpression.Left, data) as InvocationExpression;
if (overrideExpression != null)
{
TrackVisit(overrideExpression, data);
return null;
}
if (this.prettyPrintOptions.AroundAssignmentParentheses) {
outputFormatter.Space();
}
Expand Down Expand Up @@ -3187,9 +3239,22 @@ public override object TrackedVisitQueryExpressionSelectClause(QueryExpressionSe
outputFormatter.Space();
return selectClause.Projection.AcceptVisitor(this, data);
}

public override object TrackedVisitQueryExpressionWhereClause(QueryExpressionWhereClause whereClause, object data)

public override object TrackedVisitQueryExpressionSelectVBClause(QueryExpressionSelectVBClause queryExpressionSelectVBClause, object data)
{
outputFormatter.Space();
outputFormatter.PrintToken(Tokens.Select);
outputFormatter.Space();
foreach (var v in queryExpressionSelectVBClause.Variables)
{
v.AcceptVisitor(this, data);
}
return null;
}

public override object TrackedVisitQueryExpressionWhereClause(QueryExpressionWhereClause whereClause, object data)
{
outputFormatter.Space();
outputFormatter.PrintToken(Tokens.Where);
outputFormatter.Space();
return whereClause.Condition.AcceptVisitor(this, data);
Expand Down
43 changes: 42 additions & 1 deletion src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,48 @@ public void XmlEntityReference2()
TestStatement(@"Dim xml = <A>&quot;</A>",
@"var xml = new XElement(""A"", ""\"""");");
}


[Test]
public void XmlLINQDescendants()
{
TestStatement(@"Dim element = someXml...<somename>",
@"var element = someXml.Descendants(""somename"");");
}
[Test]
public void XmlLINQElements()
{
TestStatement(@"Dim element = someXml.<somename>",
@"var element = someXml.Elements(""somename"");");
}

[Test]
public void XmlLINQAttribute()
{
TestStatement(@"Dim value = someXml.@attr",
@"var value = someXml.Attribute(""attr"").Value;");
}

[Test]
public void XmlLINQAttributeSetConstant()
{
TestStatement(@"someElement.@someAttr = 8",
@"someElement.SetAttributeValue(""someAttr"", 8);");
}

[Test]
public void XmlLINQAttributeSetExpression()
{
TestStatement(@"someElement.@someAttr = string.Format(""{0}"", 19)",
@"someElement.SetAttributeValue(""someAttr"", string.Format(""{0}"", 19));");
}

[Test]
public void LinqQueryWhereSelect()
{
TestStatement(@"Dim value = From value In values Where value = ""someValue"" Select value",
@"var value = from value in values where value == ""someValue"" select value;");
}

[Test]
public void SD2_1500a()
{
Expand Down