From 61720b9ae683f97825a9e7708c9ddad4ca084b20 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Tue, 18 Aug 2020 16:14:53 -0700
Subject: [PATCH] Use '~' to represent non-HTML characters in HTML projected
 document

---
 ...iveWithViewImports_DesignTime.codegen.html |   2 +-
 .../BasicComponent_DesignTime.codegen.html    |  12 +-
 .../Basic_DesignTime.codegen.html             |  12 +-
 ...completeDirectives_DesignTime.codegen.html |  22 +--
 .../InheritsViewModel_DesignTime.codegen.html |   4 +-
 ...itsWithViewImports_DesignTime.codegen.html |   4 +-
 .../InjectWithModel_DesignTime.codegen.html   |   6 +-
 ...njectWithSemicolon_DesignTime.codegen.html |  10 +-
 .../Inject_DesignTime.codegen.html            |   2 +-
 ...alidNamespaceAtEOF_DesignTime.codegen.html |   2 +-
 ...ormedPageDirective_DesignTime.codegen.html |   2 +-
 ...xpressionTagHelper_DesignTime.codegen.html |   8 +-
 .../Model_DesignTime.codegen.html             |   2 +-
 .../MultipleModels_DesignTime.codegen.html    |   4 +-
 .../PageWithNamespace_DesignTime.codegen.html |   4 +-
 ...adingPageDirective_DesignTime.codegen.html |   2 +-
 ...sWithRouteTemplate_DesignTime.codegen.html |  20 +--
 ...rPagesWithoutModel_DesignTime.codegen.html |  32 ++--
 .../RazorPages_DesignTime.codegen.html        |  40 ++---
 .../Sections_DesignTime.codegen.html          |  16 +-
 .../UsingDirectives_DesignTime.codegen.html   |   8 +-
 ...ComponentTagHelper_DesignTime.codegen.html |  10 +-
 .../ViewWithNamespace_DesignTime.codegen.html |   2 +-
 .../_ViewImports_DesignTime.codegen.html      |   2 +-
 .../src/RazorHtmlWriter.cs                    |   6 +-
 ...TagHelperDirective_DesignTime.codegen.html |   2 +-
 ...AttributeDirective_DesignTime.codegen.html |   8 +-
 .../Await_DesignTime.codegen.html             |  36 ++--
 .../Blocks_DesignTime.codegen.html            |  50 +++---
 .../CSharp7_DesignTime.codegen.html           |  64 +++----
 .../CSharp8_DesignTime.codegen.html           | 104 +++++------
 .../CodeBlockAtEOF_DesignTime.codegen.html    |   2 +-
 ...ockWithTextElement_DesignTime.codegen.html |   8 +-
 .../CodeBlock_DesignTime.codegen.html         |  10 +-
 ...ditionalAttributes_DesignTime.codegen.html |  24 +--
 .../DesignTime_DesignTime.codegen.html        |  16 +-
 .../EmptyCodeBlock_DesignTime.codegen.html    |   2 +-
 ...ExplicitExpression_DesignTime.codegen.html |   2 +-
 ...itExpressionInCode_DesignTime.codegen.html |   6 +-
 ...ImplicitExpression_DesignTime.codegen.html |   2 +-
 ...citExpressionAtEOF_DesignTime.codegen.html |   2 +-
 ...pressionWithMarkup_DesignTime.codegen.html |   2 +-
 ...ExplicitExpression_DesignTime.codegen.html |   2 +-
 .../ExpressionsInCode_DesignTime.codegen.html |  22 +--
 ...ctionsBlockMinimal_DesignTime.codegen.html |  10 +-
 .../FunctionsBlock_DesignTime.codegen.html    |  18 +-
 .../HiddenSpansInCode_DesignTime.codegen.html |   6 +-
 .../Implements_DesignTime.codegen.html        |   8 +-
 ...citExpressionAtEOF_DesignTime.codegen.html |   2 +-
 ...ImplicitExpression_DesignTime.codegen.html |   6 +-
 ...completeDirectives_DesignTime.codegen.html |  36 ++--
 .../Inherits_DesignTime.codegen.html          |   4 +-
 .../InlineBlocks_DesignTime.codegen.html      |   4 +-
 .../Instrumented_DesignTime.codegen.html      |  52 +++---
 .../MarkupInCodeBlock_DesignTime.codegen.html |  10 +-
 ...arkup_InCodeBlocks_DesignTime.codegen.html |  72 ++++----
 .../NestedCSharp_DesignTime.codegen.html      |  12 +-
 .../NestedCodeBlocks_DesignTime.codegen.html  |   8 +-
 .../NoLinePragmas_DesignTime.codegen.html     |  52 +++---
 ...itionalExpressions_DesignTime.codegen.html |  20 +--
 .../OpenedIf_DesignTime.codegen.html          |   2 +-
 .../ParserError_DesignTime.codegen.html       |  10 +-
 .../RazorComments_DesignTime.codegen.html     |  26 +--
 ...TagHelperDirective_DesignTime.codegen.html |   2 +-
 .../Sections_DesignTime.codegen.html          |  22 +--
 .../SimpleUnspacedIf_DesignTime.codegen.html  |   6 +-
 ...trolFlowStatements_DesignTime.codegen.html | 162 +++++++++---------
 .../StringLiterals_DesignTime.codegen.html    |   8 +-
 .../Tags_DesignTime.codegen.html              |   6 +-
 .../Templates_DesignTime.codegen.html         |  68 ++++----
 ...edExpressionInCode_DesignTime.codegen.html |   6 +-
 .../Usings_DesignTime.codegen.html            |  24 +--
 72 files changed, 630 insertions(+), 630 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
index e2017f6ce6f8..672af16a9f7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
@@ -1 +1 @@
-                         
\ No newline at end of file
+~~~~~~~~~~ ~~~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
index e7b0219a389d..212a52af7b23 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
@@ -1,9 +1,9 @@
-                       
-<div class="                ">
+~~~~~~~~~~~ ~~~~~~~~~~~
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
 
-            
-                                 
- 
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
index 08d042e89793..1d05c8edd11c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
@@ -1,8 +1,8 @@
-<div class="                ">
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
-   
-                    
- 
-<p class="                         " />
+~~ 
+    ~~~ ~~~ ~ ~~~~~~
+~
+<p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
index 85fabc0abd8a..41bd21fb73e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-                                                                                   
+~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
 
-     
-      
-      "
+~~~~~
+~~~~~ 
+~~~~~ "
 
-      
-       
+~~~~~~
+~~~~~~ 
 
-       
-        
-                         
+~~~~~~~
+~~~~~~~ 
+~~~~~~~ ~~~~~~~~~~~~~~~~~
 
-          
-           
+~~~~~~~~~~
+~~~~~~~~~~ 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
index 6adf1586e10f..7c8f96178083 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                                    
-              
+~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
index b1214751a93b..cc39225641f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-     
-              
+~~~~~
+~~~~~~ ~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
index b05e435fdae9..b9ccc4dd9435 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-              
-                            
-                              
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
index 0c20f0ce0ce5..6b3f658f9627 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-              
-                                
-                                 
-                                  
-                                    
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~   
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~  ~  
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  ~  
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
index 8a218bdd8dad..579717aaec4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
@@ -1 +1 @@
-                            
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
index c72931e132ba..8a36a67848ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
@@ -1 +1 @@
-           Test.
\ No newline at end of file
+~~~~~~~~~~ Test.
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
index 9645bac584dd..ef573d0f478c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-      "foo
+~~~~~ "foo
 
 <h1>About Us</h1>
 <p>We are awesome.</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
index 4649d9d2d64b..0109819d0a0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-<input-test for="    " />
-<input-test for="      " />
+<input-test for="~~~~" />
+<input-test for="~~~~~~" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
index 1638a82fb44c..9eb7434ef14a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
@@ -1 +1 @@
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
index 4a2f4743cfc7..338f2c39940e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                            
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
index 6742b0a9e33d..f3527d34b88c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-     
-                         
+~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~
 <h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
index 8f9ba3e6233b..e1debaeb457f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
@@ -1,2 +1,2 @@
 <div>Some text here.</div>
-     
+~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
index dbfd76ba01f2..6ea17442f79b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
@@ -1,13 +1,13 @@
-              
+~~~~~ ~~~~~~~~
 
-               
-                                          
+~~~~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                     
-     
-                                        
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
-<h1>New Customer            </h1>
+<h1>New Customer ~~~~~~~~~~~</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
index ae827b127094..1788ff55ca6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
@@ -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>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
index dc0c2ec4e1b7..3bc18cff89a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
@@ -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>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
index 849f18b01572..1dc5378382f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -1,14 +1,14 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-   
-                                         
- 
+~~ 
+    ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
 <div>Some body</div>
 
-                   
+~~~~~~~~ ~~~~~~~~ ~
     <div>This is in Section 1</div>
-    <input-test for="    " />
- 
\ No newline at end of file
+    <input-test for="~~~~" />
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
index 52fe51a13096..38bab0bda99b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-                            
-                         
-             
-             
\ No newline at end of file
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~
+~~~~~~ ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
index 5b456be824f8..e3c647d97a4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-                          
-  
-                      
- 
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~
+    ~~~ ~~~ ~ ~~~~~~~~
+~
 
-<vc:test first-name="    " bar=" World"></vc:test>
\ No newline at end of file
+<vc:test first-name="~~~~" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
index 835b3a68caea..30c2f53307d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                         
+~~~~~~~~~~ ~~~~~~~~~~~~~~
 <h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
index 262e601e9cc7..f53681d3d2e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
@@ -1 +1 @@
-                                  
\ No newline at end of file
+~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
index 6d29531efb9f..d8c06a379dcf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
@@ -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;
@@ -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))
@@ -150,7 +150,7 @@ private void WriteToken(SyntaxToken token)
                 }
                 else
                 {
-                    Builder.Append(' ');
+                    Builder.Append('~');
                 }
             }
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
index 0da46f2152d1..9798fda642fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
@@ -1 +1 @@
-                               
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
index fd82d1980659..bc07a83107e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-                                                                   
-                                                              
-                                                                             
-                                                       
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
 
 Hello World
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
index 22593ca1ef47..9206eae15e5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
@@ -1,26 +1,26 @@
-            
-                                   
-     
-                     
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~~~~~ ~~~~~
+    ~
+        ~~~~~~ ~~~~~~
+    ~
+~
 
 <section>
     <h1>Basic Asynchronous Expression Test</h1>
-    <p>Basic Asynchronous Expression:             </p>
-    <p>Basic Asynchronous Template:               </p>
-    <p>Basic Asynchronous Statement:                  </p>
-    <p>Basic Asynchronous Statement Nested:    <b>            </b>  </p>
-    <p>Basic Incomplete Asynchronous Statement:       </p>
+    <p>Basic Asynchronous Expression: ~~~~~~ ~~~~~</p>
+    <p>Basic Asynchronous Template: ~~~~~~~ ~~~~~~</p>
+    <p>Basic Asynchronous Statement: ~~ ~~~~~ ~~~~~~ ~</p>
+    <p>Basic Asynchronous Statement Nested: ~~ <b>~~~~~~ ~~~~~</b> ~</p>
+    <p>Basic Incomplete Asynchronous Statement: ~~~~~~</p>
 </section>
 
 <section>
     <h1>Advanced Asynchronous Expression Test</h1>
-    <p>Advanced Asynchronous Expression:                 </p>
-    <p>Advanced Asynchronous Expression Extended:                     </p>
-    <p>Advanced Asynchronous Template:                          </p>
-    <p>Advanced Asynchronous Statement:                                           </p>
-    <p>Advanced Asynchronous Statement Extended:                         </p>
-    <p>Advanced Asynchronous Statement Nested:    <b>                            </b>  </p>
-    <p>Advanced Incomplete Asynchronous Statement:                     </p>
+    <p>Advanced Asynchronous Expression: ~~~~~~ ~~~~~~ ~~</p>
+    <p>Advanced Asynchronous Expression Extended: ~~~~~~ ~~~~~~~~~~ ~~</p>
+    <p>Advanced Asynchronous Template: ~~~~~~~ ~~~~~~~~~~ ~~~~~~</p>
+    <p>Advanced Asynchronous Statement: ~~ ~~~~~ ~~~~~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~</p>
+    <p>Advanced Asynchronous Statement Extended: ~~ ~~~~~ ~~~~~~~~~~ ~~ ~</p>
+    <p>Advanced Asynchronous Statement Nested: ~~ <b>~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~</b> ~</p>
+    <p>Advanced Incomplete Asynchronous Statement: ~~~~~~ ~~~~~~~~~~~~~</p>
 </section>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
index dc08c79219d9..b36df6862afd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
@@ -1,37 +1,37 @@
-  
-              
- 
+~~
+    ~~~ ~ ~ ~~
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-<p>i is now   </p>
+<p>i is now ~~</p>
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
index a2aad32abe93..d3e8f46d6bae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
@@ -1,43 +1,43 @@
 <body>
-      
-                                                                                                    
-         
-                                                
-          
+    ~~
+        ~~~ ~~~~~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~ ~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~ ~~~~~~~~~
+        ~
+            ~~~~~~ ~~~~~ ~ ~~~~~~~~ ~~~~~~ ~~~~~
+        ~~
 
-                                                     
+        ~~ ~~~~ ~~ ~~~ ~~ ~ ~~~~ ~~~~ ~~~~~~ ~~~~~ ~~
 
-                                  
-                                                   
-                                                           
-                                                                                             
-     
+        ~~~ ~~~~~~~ ~ ~~~~~~~~~~~~
+        ~~~~ ~~~~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                                           
-     
-                                      
-         
-                           
-         
-     
+    ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~ ~~~ ~~~ ~~~~~~~
+    ~
+        ~~ ~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~
+        ~
+            ~~ ~~ ~~~~~~~~~
+        ~
+    ~
     <p>
-        Here's a very unique number:                                                                  
+        Here's a very unique number: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     </p>
 
     <div>
-                                                                
+        ~~~~~~~~~ ~~~~~~~ ~~~~~ ~~~~~~~~~~~~~ ~~ ~~~~~ ~~~~~~ ~~
     </div>
 
-                         
-     
-                     
-                           
-                  
-                                               
-                                
-                  
-                  
-                                        
-                  
-     
+    ~~~~~~~ ~~~~~~~~~~~~~
+    ~
+        ~~~~ ~~~ ~~~~
+            ~~ ~~ ~~~~~~~~~
+            ~~~~~~
+        ~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
+            ~~ ~~ ~~~~ ~~~~~~~~~
+            ~~~~~~
+        ~~~~ ~~~~~
+            ~~ ~~ ~~~~ ~~~~ ~~ ~~~~~~~~~
+            ~~~~~~
+    ~
 </body>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
index 2e0ee4dc6ebb..25245b195da1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
@@ -1,67 +1,67 @@
-                                 
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  
-                                               
-     
-                    
-     
+~~
+    ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~
+    ~
 
-                                                   
-     
+    ~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-     
+    ~
 
-                       
-                                                           
+    ~~~~~ ~~~~~ ~ ~~~~~
+    ~~~~~ ~~~ ~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-                                      
-                             
-                             
-     
-                              
-     
- 
+    ~~~ ~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~
+    ~~~ ~~~~~~~~ ~ ~~~~~~~~~~
+    ~~~~~~ ~~~~~~~~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~~~~~~~~~~
+    ~
+~
 
-            
-                
+~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 
-                 
- 
-                                   
-                                     
-                      
-  
+~~~~~~~~~~ ~~~~~~
+~
+    ~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~
+    ~~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~~
+    ~ ~~ ~~~~ ~~~~~~~~
+~~
 
-                                                
- 
-        
- 
+~~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~
+~
+    ~~~~
+~
 
-             
-                     
-                      
+~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                 
-     
-              
-              
-     
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~
+    ~
+        ~~~~~~
+        ~~~~~~
+    ~
 
-                                                     
-     
-                                                                 
-                                      
-     
+    ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~
+    ~
+        ~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                       
+    ~~~~~~~ ~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~
 
-                                          
+    ~~~~~~~ ~~~~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~
 
-                                                          
+    ~~~~~~~ ~~~~~~~~~~~ ~~~~~~~~ ~~~~~~~~~~~ ~ ~~~~ ~~~~ ~
 
-                       
-     
-                                         
-     
- 
\ No newline at end of file
+    ~~~~~~~ ~~~~~ ~~~~~
+    ~
+        ~~~~~~ ~~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
index 136d06384a4c..68db24f6303b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
@@ -1 +1 @@
-  
\ No newline at end of file
+~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
index a6e01f1a0e64..738f635fb736 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-  
-               <text>foo</text> 		
-              			<text>bar       </text>
- 
+~~
+    ~~~ ~ ~ ~~ <text>foo</text> 		
+    ~~~ ~ ~ ~~			<text>bar ~~~~~~</text>
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
index f857199dcf16..9a924676bc4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-                                  
-                                                                    
-     
- 
\ No newline at end of file
+~~
+    ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+        ~~~~~~~~~~~~~~~~~~~~~~ ~~~~ ~~~ ~~ ~ ~~~~~~~~~~~~ ~ ~~~~~~~~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
index 46a4402680ba..6d16f3df2c5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-  
-                  
-                    
+~~
+    ~~~ ~~ ~ ~~~~~
+    ~~~ ~~~ ~ ~~~~~~
     <a href="Foo" />
-    <p class="    " />
-    <p class="foo     " />
-    <p class="     foo" />
-    <input type="checkbox" checked="   " />
-    <input type="checkbox" checked="foo    " />
-    <p class="                         " />
+    <p class="~~~~" />
+    <p class="foo ~~~~" />
+    <p class="~~~~ foo" />
+    <input type="checkbox" checked="~~~" />
+    <input type="checkbox" checked="foo ~~~" />
+    <p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />
     <a href="~/Foo" />
-    <script src="                                             " type="text/javascript"></script>
-    <script src="                                                             " type="text/javascript"></script>
+    <script src="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" type="text/javascript"></script>
+    <script src="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" type="text/javascript"></script>
     <script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
index be5ba4979a03..a8754ea813a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
@@ -1,15 +1,15 @@
 <div>
-                                           
-    <p>This is item #  </p>
-             
+            ~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+    <p>This is item #~~</p>
+            ~
 </div>
 
 <p>
-               
-      <p>Bar      Biz</p> 
+~~~~~~~~~~~~~~~
+~~~~~~<p>Bar ~~~~ Biz</p>~
 </p>
 
-                 
+~~~~~~~~ ~~~~~~ ~
     <p>Foo</p>
-        
- 
\ No newline at end of file
+    ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
index 9ebe0e3a7822..99a7f08ac047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-   
\ No newline at end of file
+~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
index 9ebe0e3a7822..99a7f08ac047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-   
\ No newline at end of file
+~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
index 1568f6aa34f3..0c15e1469835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-     
- 
\ No newline at end of file
+~~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
index 76ee36910b47..758fb714e81e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
- !
\ No newline at end of file
+~!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
index 6eaf3f7aa0bd..d166c19f55a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-  
\ No newline at end of file
+~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
index fc593178498f..b410eec8a5e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
@@ -1 +1 @@
-<div>   </div>
\ No newline at end of file
+<div>~~~</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
index 33b749a2f937..152cef197aeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
@@ -1 +1 @@
-1 + 1 =       
\ No newline at end of file
+1 + 1 = ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
index de86958addfc..557c25099c9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
@@ -1,16 +1,16 @@
-  
-                      
-                       
- 
+~~
+    ~~~~~~ ~~~ ~ ~~~~~
+    ~~~~~~ ~~~ ~ ~~~~~~
+~
 
-                  
-        
-        
+~~~~~~~ ~~ ~~~~~ ~
+    ~~~~
+~ ~~~~ ~
     <p>Foo is Null!</p>
- 
+~
 
 <p>
-                                 
-                            
- 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
+    ~~~~~~~~~~~~~~~~~~ ~~~~~
+~
 </p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
index 6393f9703b5f..2a7f3ddff8a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
@@ -1,7 +1,7 @@
 
 
-	           
-                          
-	                   
- 
- 
\ No newline at end of file
+	~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~ ~~~~~~ ~
+	~~~~~~ ~~~~~ ~ ~~~~
+~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
index 46d84b460b85..896d2c841527 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
@@ -1,12 +1,12 @@
-            
+~~~~~~~~~~ ~
 
- 
+~
 
-            
-                                
-                             
-                            
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~ ~~~ ~~~~~~~~~
+    ~~~~~~~ ~~~ ~~~~~~~~~~~ ~
+        ~~~~~~ ~~~~~~~~~~~~~
+    ~
+~
 
-Here's a random number:             
\ No newline at end of file
+Here's a random number: ~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
index 13484a1b456c..88647e0895ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-        
- 
\ No newline at end of file
+~~
+    ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
index d0776340e1a6..8d87a8e68a75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-                       
+~~~~~~~~~~~ ~~~~~~~~~~~
 
-            
-                                  
- 
\ No newline at end of file
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~ ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
index f1c2edafa225..28138a2cddf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
index c3ca733a2bc7..b8f7cde9f741 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-                               
-    <p>This is item #  </p>
- 
\ No newline at end of file
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+    <p>This is item #~~</p>
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
index b7d08f385618..d932435cea17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -1,25 +1,25 @@
-                                                                                   
+~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
 
-             
-              
-               
+~~~~~~~~~~~~~
+~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~ ~
 
-                
-                 
-                  
+~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~~~~ ~
 
-                
-                 
-                  
+~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~~~~ ~
 
-         
-          
+~~~~~~~~~
+~~~~~~~~~ 
 
-          
-           
+~~~~~~~~~~
+~~~~~~~~~~ 
 
-        
-         
+~~~~~~~~
+~~~~~~~~ 
 
-         {
-            
\ No newline at end of file
+~~~~~~~~ {
+~~~~~~~~~~ ~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
index b60ac0100e38..9cd1d59959a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-                               
+~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
 
-      
\ No newline at end of file
+~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
index 3b6fa1cd0620..18ebd6d308e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-             (string link) {
-    <a href="                                   <text>#</text>  " />
+~~~~~~~~ ~~~~(string link) {
+    <a href="~~~~~~~~ ~~ ~~~~~ ~ ~~~~~ ~ ~~~~ ~ <text>#</text> ~" />
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
index 111d1f7474ce..1c44204c9352 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
@@ -1,38 +1,38 @@
-  
-              
-               <p>Bar</p> 
-      Hello, World
+~~
+    ~~~ ~ ~ ~~
+    ~~~ ~~~ ~ ~<p>Bar</p>~
+    ~~Hello, World
     <p>Hello, World</p>
- 
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
index 9148ce732370..ad3e1315f2bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-                                  
-        <p>Hello from C#, #               </p>
-     
- 
+~~
+    ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+        <p>Hello from C#, #~~~~~~~~~~~~~~~</p>
+    ~
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
index 4b346c914a4b..554040f8c49a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
@@ -1,45 +1,45 @@
 
-  
-                             
-     
-                                                   
-      
-
-                                 
-     
-        <div>            </div>
-     
- 
-
-                         
-                                 
-
-            
-                                        
-     
-                                             
+~~
+    ~~~ ~~~~~~ ~ ~~~ ~~~~~~~~
+    ~
+        ~~~ ~~~~~~~~ ~ ~~~~ ~ ~~~~~~~~~ ~~~ ~ ~~~ ~
+    ~~
+
+    ~~~~ ~~~~~~~~~~~~~~~~ ~~~~~~~
+    ~
+        <div>~~~~~~~~~~~~</div>
+    ~
+~
+
+~~ ~~~~~~~~~~~~~~~~~~~~ ~
+~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
+
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~
+    ~
+        ~~~ ~~~~~~~~~ ~ ~~~~~ ~~~~~~~~~~~~~~~
         <div>
-            <h3>Happy birthday             !</h3>
+            <h3>Happy birthday ~~~~~~~~~~~~!</h3>
         </div>
 
         <ul>
-                                                  
-         
-            <li>     Happy birthday!</li>
-         
+        ~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~~~~~~~~ ~ ~~~ ~~~~
+        ~
+            <li>~~~~ Happy birthday!</li>
+        ~
         </ul>
 
-                            
-         
-                   
-         
+        ~~ ~~~~~~~~~~~ ~ ~~~
+        ~
+            ~~~~~~~
+        ~
 
         <h4>Secret message</h4>
-     
-
-                
-     
-                                        
-                                    
-     
- 
\ No newline at end of file
+    ~
+
+    ~~~~~ ~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+        ~~~~~~ ~~~ ~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
index c1b9240ee07a..1a78d3888c91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
@@ -1,8 +1,8 @@
-  
-                                         
-     
+~~
+    ~~~~~~~~ ~~~~ ~~~~~~ ~~ ~~~~~~~~~~~~~
+    ~
         <div>
-                             .
+            ~~~~~~~~~~~~~~~~~.
         </div>
-     
- 
\ No newline at end of file
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
index c56380dfcb99..966b588e290f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-          
-              
-     
- 
\ No newline at end of file
+~~~~~~~~ ~
+    ~~~~~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
index b7c02278c1d0..494393779b10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
@@ -1,38 +1,38 @@
-  
-              
- 
+~~
+    ~~~ ~ ~ ~~
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-                                  
-<p>i is now   </p>
+~~ ~~~~ ~~~ ~~ ~~~~~~~~~~ ~~ ~~ ~~
+<p>i is now ~~</p>
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
index 7ad423b1f29e..e40e3c6f4954 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
@@ -1,11 +1,11 @@
-  
-                  
-                           
-                               
-                                              
- 
+~~
+    ~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
-              
-                       
-                           
-                                          
\ No newline at end of file
+~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
index 1675f6438378..42ba9c64b06a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-             
+~~~ ~~~~~~ ~ 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
index d0076463280f..61e3b424cb11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-  
-          
-          
- 
\ No newline at end of file
+~~
+~~
+~~~ ~ ~~~~
+~~~ ~ ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
index f851e2e59774..d4faa3491649 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
@@ -1,18 +1,18 @@
-                                    
-<p>This should           be shown</p>
+~~~~~~ ~~ ~~~ ~~~~~ ~~ ~~ ~~~~~~~~~~
+<p>This should ~~ ~~~ ~~ be shown</p>
 
-  
-                                       
-                                                       
-                     
-                  
-     
- 
+~~
+    ~~ ~~~~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~
+    ~~~~~~~~~ ~~~ ~ ~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~ ~~~~~
+    ~~~~~~ ~~ ~~~~~ ~
+        ~~~~~ ~~~~
+    ~
+~
 
-                           
-<p>But this should show the comment syntax:     </p>
+~~ ~~~ ~~~ ~ ~~~ ~~~ ~~~~ ~
+<p>But this should show the comment syntax: ~~~~</p>
 
-         
+~~~~~~~~~
 
 <input value="@*this razor comment is the actual value*@" type="text" />
-<input                                             type="text" />
+<input ~~~~~~ ~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~ type="text" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
index 77def406f5ff..1460ade1eacc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
@@ -1 +1 @@
-                                
+~~~~~~~~~~~~~~~~ ~~ ~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
index 72ff37f26cb5..b47779a0df74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -1,17 +1,17 @@
-  
-                                        
- 
+~~
+    ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
 <div>This is in the Body>
 
-                   
-    <div class="some       ">This is in Section 2</div>
- 
+~~~~~~~~ ~~~~~~~~ ~
+    <div class="some ~~~~~~">This is in Section 2</div>
+~
 
-                   
+~~~~~~~~ ~~~~~~~~ ~
     <div>This is in Section 1</div>
- 
+~
 
-                          
-                                  <span>     </span>   
- 
\ No newline at end of file
+~~~~~~~~ ~~~~~~~~~~~~~~~ ~
+    ~~ ~~~~~~~~~~~~~ ~~~~~~~ ~ ~ ~<span>~~~~~</span>~ ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
index 11a63ced54cf..221eda5a6c0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-          
- 
+~~~ ~~~~~~
+~
 	<div></div>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
index 3d06dc8b909c..897f7e85741e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
@@ -1,102 +1,102 @@
 <p>Before Text</p>
 
-  
-                                                                                                
-
-                
-     
-                                             
-                                                    
-                                                  
-                                                    
-            
-                                
-     
-
-                                
-                                
-            
-
-                                          
-             
-
-      
-                     
-                                
-
-                                
-                       
-
-                                                                 
-                           
-
-                
-                       
- 
-
-            
-                       
-     
-                   
-
-                                             
-                                                    
-            
-                                               
+~~
+    ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ ~~~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ ~~~~ ~~~~~~~~~~~~~
+
+    ~~~~~~ ~~~~~
+    ~
+        ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~
+            ~~~~~~ ~~~~~~~~~~~~~
+    ~
+
+    ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+        ~~ ~~~~~~~~~~~~ ~ ~~~~~~
+        ~~~~
+
+    ~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+        ~~~~~
+
+    ~~
+        ~~~~~~~~~~~~~
+    ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+
+    ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+        ~~~~~~~~~~~~~~~
+
+    ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~~~~~~~~~~~~~~
+
+    ~~~~~ ~~~~~~
+        ~~~~~~~~~~~~~~~
+~
+
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~ ~~~~~
+    ~
+        ~~~ ~ ~ ~~~
+
+        ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~
+            ~~~~~~ ~~~ ~~~~~ ~~~~~~~~~ ~~ ~~~~~
         
-                                    
-                                    
-                
+        ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+            ~~ ~~~~~~~~~~~~ ~ ~~~~~~
+            ~~~~
 
-                                             
-                 
+        ~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+            ~~~~~
 
-          
-                         
-                                    
+        ~~
+            ~~~~~~~~~~~~~
+        ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
 
-                                    
-                           
+        ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+            ~~~~~~~~~~~~~~~
 
-                                                                     
-                               
+        ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~~~~~~~~~~~~
 
-                   
-                           
-     
+        ~~~~ ~~~~~~
+            ~~~~~~~~~~~~~~~
+    ~
 
-                         
+    ~~~ ~~~~~~~~~~~~ ~ ~~
 
-                                
-     
-                                 
-     
+    ~~~~~~ ~~~~ ~~~~~~~~~~~~~~~~
+    ~
+        ~~ ~~~~~~ ~~~~~~~~~~~~~~~
+    ~
 
- 
+~
 
-                             
-      
+~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+    ~~
 
-                                      
-         
+~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+    ~~~~~
 
-   
-                 
-                            
+~~~
+    ~~~~~~~~~~~~~
+~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
 
-                             
-                   
+~~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+    ~~~~~~~~~~~~~~~
 
-                                                              
-                              
-                       
+~~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~ ~~~~~~~ ~~~ ~~~~~~ ~~~~
+    ~~~~~~~~~~~~~~~~~~~
 
-            
-                   
+~~~~~ ~~~~~~
+    ~~~~~~~~~~~~~~~
 
-                            <p>Hello!</p>
+~~~ ~~~~~~ ~~~~~~~~~~~~~~~~ <p>Hello!</p>
 
-           
-       <p>The time is              </p>
+~~~ ~~~~~~ 
+    ~~ <p>The time is ~~~~~~~~~~~~~</p>
 
 <p>After Text</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
index b47c6a931ccb..823fe9a3eed3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
@@ -83,7 +83,7 @@
 <p>This is line 83</p>
 <p>This is line 84</p><br>
 
-                                
+~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~
     <p>This is line 1 nested</p>
     <p>This is line 2 nested</p>
     <p>This is line 3 nested</p>
@@ -159,7 +159,7 @@
     <p>This is line 73 nested</p>
     <p>This is line 74 nested</p>
     <p>This is line 75 nested</p>
- 
+~
 <p>This is line 1</p>
 <p>This is line 2</p>
 <p>This is line 3</p>
@@ -203,7 +203,7 @@
 <p>This is line 41</p>
 <p>This is line 42</p>
 <p>This is line 43</p>hi!
-                                    
+~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~
     <p>This is line 1 nested</p>
     <p>This is line 2 nested</p>
     <p>This is line 3 nested</p>
@@ -234,4 +234,4 @@
     <p>This is line 28 nested</p>
     <p>This is line 29 nested</p>
     <p>30</p>
- !
\ No newline at end of file
+~!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
index 419c13c11c9b..0dfbab3b0cdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-  
-    <script type="text/javascript"     ></script @foo >
- 
+~~
+    <script type="text/javascript" ~~~ ></script @foo >
+~
 
 <script type="text/html">
     <%var x = window == null%>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
index de0b7355257d..258ea1baf85c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
@@ -1,53 +1,53 @@
-            
-                                                                       
-                                             
-                                            
-                                                            
-             
-           
-     
- 
-
-  
-                                 <text>This works      !</text> 
-            
- 
-
-   
-                                 <p class="     ">Hello</p> 
-                   
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~~ ~~~~~~~~~ ~
+        ~~~~~~ ~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~ ~
+            ~~~~~~~ ~ ~ ~~ ~ ~ ~~~~~~ ~~~~ ~
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~
+        ~~~
+    ~
+~
+
+~~
+    ~~~~~~~~~~~~~ ~~~~~~~ ~~~ ~ ~<text>This works ~~~~~!</text>~
+    ~~~~~~~~
+~
+
+~~ 
+    ~~~~~~~~~~~~~ ~~~~~~~ ~~~ ~ ~<p class="~~~~~">Hello</p>~
+    ~~~~~~~~~~~~~~~
+~
 
 <ul>
-              <li>Item #     </li>  
+~~~~~~~~~~~~ ~<li>Item #~~~~~</li>~~
 </ul>
 
 <p>
-           
-       This is line#      of markup<br/>
- 
+~~~~~~~~~~~
+    ~~ This is line#~~~~~ of markup<br/>
+~
 </p>
 
 <p>
-           
-      : This is line#      of markup<br />
- 
+~~~~~~~~~~~
+    ~~: This is line#~~~~~ of markup<br />
+~
 </p>
 
 <p>
-           
-      :: This is line#      of markup<br />
- 
+~~~~~~~~~~~
+    ~~:: This is line#~~~~~ of markup<br />
+~
 </p>
 
 
 <ul>
-                 <li>
-        Item #     
-                             
+    ~~~~~~~~~~~ ~<li>
+        Item #~~~~~
+        ~~~~~ ~~~~~~ ~ ~~~~~~
         <ul>
             <li>Child Items... ?</li>
-                                                           
+            ~~~~~~~~~~~~ ~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
         </ul>
-    </li> 
+    </li>~
 </ul> 
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
index ae3e23d828ff..0af197d017d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-          
- 
\ No newline at end of file
+~~
+~~~~~~~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
index d16439d97500..47226d1ee8c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-                
-                                 
-             
+~~~~~~ ~~~~~~~~~
+~~~~~~ ~~~ ~ ~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~
 
-                    
-                            
-                                          
+~~~~~~ ~~~~~~ ~~~~~~
+~~~~~~ ~~~~~~ ~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-   
-                                                               
-                                                                                        
- 
+~~ 
+    ~~~~~ ~~~ ~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~ ~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
-<p>Path's full type name is                       </p>
-<p>Foo's actual full type name is                      </p>
\ No newline at end of file
+<p>Path's full type name is ~~~~~~~~~~~~~~~~~~~~~~</p>
+<p>Foo's actual full type name is ~~~~~~~~~~~~~~~~~~~~~</p>
\ No newline at end of file