Skip to content

Preserve quote style when rendering markup content #33548

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
merged 6 commits into from
Jun 15, 2021
Merged

Preserve quote style when rendering markup content #33548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6696838
Preserve quote style when rendering markup content
captainsafia Jun 15, 2021
c621ae6
Replace Contains check with EndsWith check
captainsafia Jun 15, 2021
fa1f8ec
Provide StringComparison arg to appease the linter
captainsafia Jun 15, 2021
fec0c69
Update src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/C…
captainsafia Jun 15, 2021
7333516
Back to strings since char overload is not supported
captainsafia Jun 15, 2021
ed7a288
Update test baselines
captainsafia Jun 15, 2021
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
9 changes: 7 additions & 2 deletions src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentMarkupBlockPass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,17 @@ public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node)
return;
}

Builder.Append("=\"");
// We examine the node.Prefix (e.g. " onfocus='" or " on focus=\"")
// to preserve the quote type that is used in the original markup.
var quoteType = node.Prefix.EndsWith("'", StringComparison.Ordinal) ? "'" : "\"";

Builder.Append('=');
Builder.Append(quoteType);

// Visit Children
base.VisitDefault(node);

Builder.Append('"');
Builder.Append(quoteType);
}

public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node)
Expand Down
4 changes: 2 additions & 2 deletions ...Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ public void Execute_CanRewriteHtml_OptionWithNoSelectAncestor()
</html>");

var expected = NormalizeContent(@"
<head cool=""beans""><option value=""1"">One</option>
<option selected value=""2"">Two</option></head>");
<head cool=""beans""><option value='1'>One</option>
<option selected value='2'>Two</option></head>");

var documentNode = Lower(document);

Expand Down
3 changes: 3 additions & 0 deletions ...rosoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6674,6 +6674,9 @@ public void EventHandlerTagHelper_EscapeQuotes()
// Act
var generated = CompileToCSharp(@"
<input onfocus='alert(""Test"");' />
<input onfocus=""alert(""Test"");"" />
<input onfocus=""alert('Test');"" />
<p data-options='{direction: ""fromtop"", animation_duration: 25, direction: ""reverse""}'></p>
");

// Assert
Expand Down
29 changes: 29 additions & 0 deletions ...onentDesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,32 @@ Document -
LazyIntermediateToken - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - alert("Test");
HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
MarkupElement - (36:1,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
HtmlAttribute - (42:1,6 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
HtmlAttributeValue - (52:1,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (52:1,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - alert(
HtmlAttribute - (59:1,23 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Test");" -
HtmlContent - (70:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (70:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
MarkupElement - (72:2,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input
HtmlAttribute - (78:2,6 [25] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - "
HtmlAttributeValue - (88:2,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (88:2,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - alert('Test');
HtmlContent - (106:2,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (106:2,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
MarkupElement - (108:3,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - p
HtmlAttribute - (110:3,2 [84] x:\dir\subdir\Test\TestComponent.cshtml) - data-options=' - '
HtmlAttributeValue - (125:3,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (125:3,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - {direction:
HtmlAttributeValue - (136:3,28 [11] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (137:3,29 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - "fromtop",
HtmlAttributeValue - (147:3,39 [20] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (148:3,40 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Html - animation_duration:
HtmlAttributeValue - (167:3,59 [4] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (168:3,60 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 25,
HtmlAttributeValue - (171:3,63 [11] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (172:3,64 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - direction:
HtmlAttributeValue - (182:3,74 [11] x:\dir\subdir\Test\TestComponent.cshtml) -
LazyIntermediateToken - (183:3,75 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - "reverse"}
HtmlContent - (199:3,91 [2] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (199:3,91 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
2 changes: 1 addition & 1 deletion ...mponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
__builder.AddAttribute(1, "MyAttr", "abc");
__builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
__builder2.AddContent(3, "Some text");
__builder2.AddMarkupContent(4, "<some-child a=\"1\">Nested text</some-child>");
__builder2.AddMarkupContent(4, "<some-child a=\'1\'>Nested text</some-child>");
}
));
__builder.CloseComponent();
Expand Down
2 changes: 1 addition & 1 deletion ...s/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Document -
ComponentChildContent - - ChildContent - context
HtmlContent - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (26:0,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text
MarkupBlock - - <some-child a="1">Nested text</some-child>
MarkupBlock - - <some-child a='1'>Nested text</some-child>
ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
LazyIntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
2 changes: 1 addition & 1 deletion ...nentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBa
#pragma warning disable 1998
protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
{
__builder.AddMarkupContent(0, "<input onfocus=\"alert(\"Test\");\">");
__builder.AddMarkupContent(0, "<input onfocus=\'alert(\"Test\");\'>\r\n<input onfocus=\"alert(\" Test\");\">\r\n<input onfocus=\"alert(\'Test\');\">\r\n<p data-options=\'{direction: \"fromtop\", animation_duration: 25, direction: \"reverse\"}\'></p>");
}
#pragma warning restore 1998
}
Expand Down
2 changes: 1 addition & 1 deletion ...omponentRuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Document -
UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
ClassDeclaration - - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -
MethodDeclaration - - protected override - void - BuildRenderTree
MarkupBlock - - <input onfocus="alert("Test");">
MarkupBlock - - <input onfocus='alert("Test");'>\n<input onfocus="alert(" Test");">\n<input onfocus="alert('Test');">\n<p data-options='{direction: "fromtop", animation_duration: 25, direction: "reverse"}'></p>