Skip to content

Use '~' to represent non-HTML characters in HTML projected document #25027

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
1 commit merged into from
Aug 19, 2020
Merged

Use '~' to represent non-HTML characters in HTML projected document #25027

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
2 changes: 1 addition & 1 deletion ...s/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
~~~~~~~~~~ ~~~~~~~~~~~~~~
12 changes: 6 additions & 6 deletions ...les/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class=" ">
~~~~~~~~~~~ ~~~~~~~~~~~
<div class="~~~~~~~~~~~~~~~~">
Hello world
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
</div>

~~~~~~~~~~ ~
~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~
~
12 changes: 6 additions & 6 deletions ...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class=" ">
<div class="~~~~~~~~~~~~~~~~">
Hello world
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
</div>
<p class=" " />
~~
~~~ ~~~ ~ ~~~~~~
~
<p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />
22 changes: 11 additions & 11 deletions ...tegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~

"
~~~~~
~~~~~
~~~~~ "

~~~~~~
~~~~~~

~~~~~~~
~~~~~~~
~~~~~~~ ~~~~~~~~~~~~~~~~~

~~~~~~~~~~
~~~~~~~~~~
4 changes: 2 additions & 2 deletions .../IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~ ~~~~~~~
4 changes: 2 additions & 2 deletions ...rationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
~~~~~
~~~~~~ ~~~~~~~
6 changes: 3 additions & 3 deletions ...es/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
~~~~~~ ~~~~~~~
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~
10 changes: 5 additions & 5 deletions ...ntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
~~~~~~ ~~~~~~~
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~ ~
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~ ~
2 changes: 1 addition & 1 deletion ...t/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
2 changes: 1 addition & 1 deletion ...egrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Test.
~~~~~~~~~~ Test.
2 changes: 1 addition & 1 deletion ...grationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"foo
~~~~~ "foo

<h1>About Us</h1>
<p>We are awesome.</p>
8 changes: 4 additions & 4 deletions ...ationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
~~~~~~ ~~~~~~~~

~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~

<input-test for=" " />
<input-test for=" " />
<input-test for="~~~~" />
<input-test for="~~~~~~" />
2 changes: 1 addition & 1 deletion ...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4 changes: 2 additions & 2 deletions ...les/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4 changes: 2 additions & 2 deletions .../IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
~~~~~
~~~~~~~~~~ ~~~~~~~~~~~~~~
<h1>Hi There!</h1>
2 changes: 1 addition & 1 deletion ...CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<div>Some text here.</div>
~~~~~
20 changes: 10 additions & 10 deletions ...onTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
~~~~~ ~~~~~~~~

~~~~~~ ~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~ ~
~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
~
~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
~
~

<h1>New Customer </h1>
<h1>New Customer ~~~~~~~~~~~</h1>
32 changes: 16 additions & 16 deletions ...grationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
~~~~~

~~~~~~~~~~~~~ ~~~ ~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~ ~
~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
~
~~~~ ~ ~~~~~~~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~

~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~

~~~~~~ ~~~~~ ~~~~~~~~
~
~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
~
~

<h1>New Customer</h1>
<form method="post" class="form-horizontal">
<div class="text-danger"></div>
<div class="form-group">
<label class="col-md-2 control-label"> </label>
<label class="col-md-2 control-label">~~~~~</label>
<div class="col-md-10">
<input class="form-control" />
<span class="text-danger"></span>
Expand Down
40 changes: 20 additions & 20 deletions ...stFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
~~~~~

~~~~~~ ~~~~~~~~
~~~~~~~~~~~~~ ~~~ ~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~ ~
~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
~
~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
~
~~~~ ~ ~~~~~~~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~

~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
~

~~~~~~ ~~~~~ ~~~~~~~~
~
~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
~
~

<h1>New Customer</h1>
<form method="post" class="form-horizontal" >
<div class="text-danger"></div>
<div class="form-group">
<label class="col-md-2 control-label"> </label>
<label class="col-md-2 control-label">~~~~~~~~~~~</label>
<div class="col-md-10">
<input class="form-control" />
<span class="text-danger"></span>
Expand Down
16 changes: 8 additions & 8 deletions ...TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
~~~~~~ ~~~~~~~~

~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~

~~
~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~

<div>Some body</div>

~~~~~~~~ ~~~~~~~~ ~
<div>This is in Section 1</div>
<input-test for=" " />
<input-test for="~~~~" />
~
8 changes: 4 additions & 4 deletions ...es/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
~~~~~~ ~~~~~~~~~~~~~~~~~~
~~~~~~ ~~~~~~
~~~~~~ ~~~~~~
10 changes: 5 additions & 5 deletions ...grationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
~~~~~~~~~~~~~ ~~~ ~~~~~~~~
~~
~~~ ~~~ ~ ~~~~~~~~
~

<vc:test first-name=" " bar=" World"></vc:test>
<vc:test first-name="~~~~" bar=" World"></vc:test>
2 changes: 1 addition & 1 deletion .../IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
~~~~~~~~~~ ~~~~~~~~~~~~~~
<h1>Hi There!</h1>
2 changes: 1 addition & 1 deletion ...Files/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~
6 changes: 3 additions & 3 deletions src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
Expand Down Expand Up @@ -141,7 +141,7 @@ private void WriteToken(SyntaxToken token)
return;
}

// We're in non-HTML context. Let's replace all non-whitespace chars with a space.
// We're in non-HTML context. Let's replace all non-whitespace chars with a tilde(~).
foreach (var c in content)
{
if (char.IsWhiteSpace(c))
Expand All @@ -150,7 +150,7 @@ private void WriteToken(SyntaxToken token)
}
else
{
Builder.Append(' ');
Builder.Append('~');
Copy link
Contributor Author

@ajaybhargavb ajaybhargavb Aug 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actual code change.

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...egrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~
8 changes: 4 additions & 4 deletions ...IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~

Hello World
Loading