Skip to content

Fix XML literals to be XML-decoded when converted to C# strings #1236

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

Open
GrahamTheCoder wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −29
Open

Fix XML literals to be XML-decoded when converted to C# strings #1236

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
4 changes: 2 additions & 2 deletions CodeConverter/CSharp/XmlExpressionConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public async Task<CSharpSyntaxNode> ConvertXmlAttributeAsync(VBasic.Syntax.XmlAt
}

public async Task<CSharpSyntaxNode> ConvertXmlStringAsync(VBasic.Syntax.XmlStringSyntax node) =>
CommonConversions.Literal(string.Join("", node.TextTokens.Select(b => b.Text)));
CommonConversions.Literal(string.Join("", node.TextTokens.Select(b => b.ValueText)));

public async Task<CSharpSyntaxNode> ConvertXmlTextAsync(VBSyntax.XmlTextSyntax node) =>
CommonConversions.Literal(string.Join("", node.TextTokens.Select(b => b.Text)));
CommonConversions.Literal(string.Join("", node.TextTokens.Select(b => b.ValueText)));

public async Task<CSharpSyntaxNode> ConvertXmlCDataSectionAsync(VBSyntax.XmlCDataSectionSyntax node)
{
Expand Down
31 changes: 4 additions & 27 deletions Tests/CSharp/ExpressionTests/XmlExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,13 @@ private void TestMethod()
new XElement(""Author"", ""Garghentini, Davide""),
new XElement(""Title"", ""XML Developer's Guide""),
new XElement(""Price"", ""44.95""),
new XElement(""Description"", @""
An in-depth look at creating applications
with "", new XElement(""technology"", ""XML""), @"". For
"", new XElement(""audience"", ""beginners""), @"" or
"", new XElement(""audience"", ""advanced""), @"" developers.
"")
new XElement(""Description"", ""\n An in-depth look at creating applications\n with "", new XElement(""technology"", ""XML""), "". For\n "", new XElement(""audience"", ""beginners""), "" or\n "", new XElement(""audience"", ""advanced""), "" developers.\n "")
),
new XElement(""Book"", new XAttribute(""id"", ""bk331""),
new XElement(""Author"", ""Spencer, Phil""),
new XElement(""Title"", ""Developing Applications with Visual Basic .NET""),
new XElement(""Price"", ""45.95""),
new XElement(""Description"", @""
Get the expert insights, practical code samples,
and best practices you need
to advance your expertise with "", new XElement(""technology"", @""Visual
Basic .NET""), @"".
Learn how to create faster, more reliable applications
based on professional,
pragmatic guidance by today's top "", new XElement(""audience"", ""developers""), @"".
"")
new XElement(""Description"", ""\n Get the expert insights, practical code samples,\n and best practices you need\n to advance your expertise with "", new XElement(""technology"", ""Visual\n Basic .NET""), "".\n Learn how to create faster, more reliable applications\n based on professional,\n pragmatic guidance by today's top "", new XElement(""audience"", ""developers""), "".\n "")
)
)

Expand Down Expand Up @@ -373,19 +360,9 @@ internal partial class TestClass
{
private void TestMethod()
{
string processedHtml = new XCData(@""
<!DOCTYPE html PUBLIC """"-//W3C//DTD XHTML 1.0 Transitional//EN"""" """"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"""">
<html xmlns=""""http://www.w3.org/1999/xhtml"""">
<head>
<meta http-equiv=""""Content-Type"""" content=""""text/html; charset=utf-8"""" /><title>
</head>
<body>
<p class=""""cs95E872D0""""><span class=""""cs9D249CCB"""">&nbsp;Regards,</span></p>
</body>
</html>
"").Value;
string processedHtml = new XCData(""\n<!DOCTYPE html PUBLIC \""-//W3C//DTD XHTML 1.0 Transitional//EN\"" \""http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"">\n<html xmlns=\""http://www.w3.org/1999/xhtml\"">\n\t<head>\n\t\t<meta http-equiv=\""Content-Type\"" content=\""text/html; charset=utf-8\"" /><title>\n\t</head>\n\t<body>\n\t\t<p class=\""cs95E872D0\""><span class=\""cs9D249CCB\"">&nbsp;Regards,</span></p>\n </body>\n</html>\n "").Value;
}
}");
}", incompatibleWithAutomatedCommentTesting: true);

}
}
26 changes: 26 additions & 0 deletions Tests/CSharp/ExpressionTests/XmlExpressionTestsLocal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using ICSharpCode.CodeConverter.Tests.TestRunners;
using Xunit;
using System.Threading.Tasks;

namespace ICSharpCode.CodeConverter.Tests.CSharp.ExpressionTests;

public class XmlExpressionTestsLocal : ConverterTestBase
{
[Fact]
public async Task XmlLiteralDecodingAsync()
{
await TestConversionVisualBasicToCSharpAsync(@"Class TestClass
Private Sub TestMethod()
Dim v = <xml>&lt;</xml>.Value
End Sub
End Class", @"using System.Xml.Linq;

internal partial class TestClass
{
private void TestMethod()
{
string v = new XElement(""xml"", ""<"").Value;
}
}");
}
}
Loading